fix code style

famoser · Dec 28, 2019 · 4821d84 · 4821d84
1 parent c4a745e
commit 4821d84
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 177 deletions.
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":309:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:3:{s:73:"App\Tests\Controller\LoginControllerTest::testPublicUrls with data set #0";d:10.542;s:73:"App\Tests\Controller\LoginControllerTest::testSecureUrls with data set #0";d:0.084;s:70:"App\Tests\Controller\LoginControllerTest::test404Urls with data set #0";d:2.716;}}}
diff --git a/src/Controller/Administration/OrganisationController.php b/src/Controller/Administration/OrganisationController.php
@@ -56,12 +56,12 @@ public function exportAction(CsvServiceInterface $csvService)
             $entry = [];
             $entry[] = $organisation->getName();
             $entry[] = $organisation->getEmail();
-            $entry[] = $this->generateUrl("login_code", ["code" => $organisation->getAuthenticationCode()], UrlGeneratorInterface::ABSOLUTE_URL);
+            $entry[] = $this->generateUrl('login_code', ['code' => $organisation->getAuthenticationCode()], UrlGeneratorInterface::ABSOLUTE_URL);
 
             $organisationArray[] = $entry;
         }
 
-        return $csvService->streamCsv("authentication_codes.csv", $organisationArray);
+        return $csvService->streamCsv('authentication_codes.csv', $organisationArray);
     }
 
     /**
@@ -71,7 +71,7 @@ public function exportAction(CsvServiceInterface $csvService)
      */
     public function eventsAction(Organisation $organisation)
     {
-        return $this->render("administration/organisation/events.twig", ['organisation' => $organisation]);
+        return $this->render('administration/organisation/events.twig', ['organisation' => $organisation]);
     }
 
     /**

diff --git a/src/Controller/Base/BaseController.php b/src/Controller/Base/BaseController.php
@@ -11,7 +11,6 @@
 
 namespace App\Controller\Base;
 
-use App\Entity\FrontendUser;
 use App\Model\Breadcrumb;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php
@@ -14,9 +14,7 @@
 use App\Controller\Base\BaseFormController;
 use App\Entity\Organisation;
 use App\Form\PasswordContainer\LoginType;
-use App\Model\User;
 use App\Security\UserProvider;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -36,9 +34,10 @@ public static function getSubscribedServices()
     {
         return parent::getSubscribedServices() +
             [
-                'event_dispatcher' => EventDispatcherInterface::class
+                'event_dispatcher' => EventDispatcherInterface::class,
             ];
     }
+
     /**
      * @Route("", name="login")
      *
@@ -66,24 +65,19 @@ public function indexAction(AuthenticationUtils $authenticationUtils)
     public function codeAction(Request $request, string $code, UserProvider $provider)
     {
         /** @var Organisation $organisation */
-
-        $organisation = $this->getDoctrine()->getRepository(Organisation::class)->findOneBy(["authenticationCode" => $code]);
+        $organisation = $this->getDoctrine()->getRepository(Organisation::class)->findOneBy(['authenticationCode' => $code]);
         if ($organisation === null) {
             $this->displayError($this->getTranslator()->trans('login.error.invalid_auth_code', [], 'login'));
         } else {
             $user = $provider->loadUserByUsername($organisation->getEmail());
             $this->loginUser($request, $user);
 
-            return $this->redirectToRoute("organisation_view", ["organisation" => $organisation->getId()]);
+            return $this->redirectToRoute('organisation_view', ['organisation' => $organisation->getId()]);
         }
 
         return $this->render('login/login_code.html.twig');
     }
 
-    /**
-     * @param Request       $request
-     * @param UserInterface $user
-     */
     protected function loginUser(Request $request, UserInterface $user)
     {
         //login programmatically

diff --git a/src/Controller/Organisation/EventController.php b/src/Controller/Organisation/EventController.php
@@ -42,7 +42,7 @@ public function newAction(Organisation $organisation, Request $request, Translat
         $event = new Event();
         $event->setSemester(SemesterType::getCurrentSemester());
         $event->setOrganisation($organisation);
-        $event->setLocation("");
+        $event->setLocation('');
         $event->setBudget(0);
         $event->setNeedFinancialSupport(false);
         $event->setStartDate(new \DateTime());
@@ -60,14 +60,13 @@ function () use ($event, $translator) {
         }
 
         $this->organisation = $organisation;
+
         return $this->render('organisation/event/new.html.twig', ['form' => $myForm->createView()]);
     }
 
     /**
      * @Route("/{event}/clone", name="organisation_event_copy")
      *
-     * @param Organisation $organisation
-     * @param Event $event
      * @return Response
      */
     public function copyAction(Organisation $organisation, Event $event)
@@ -78,7 +77,7 @@ public function copyAction(Organisation $organisation, Event $event)
         $manager->persist($clonedEvent);
         $manager->flush();
 
-        return $this->redirectToRoute("organisation_event_edit", ["organisation" => $organisation->getId(), "event" => $event->getId()]);
+        return $this->redirectToRoute('organisation_event_edit', ['organisation' => $organisation->getId(), 'event' => $event->getId()]);
     }
 
     /**
@@ -102,6 +101,7 @@ function () use ($event, $translator) {
         }
 
         $this->organisation = $organisation;
+
         return $this->render('organisation/event/edit.html.twig', ['form' => $myForm->createView(), 'event' => $event]);
     }
 
@@ -115,17 +115,19 @@ public function removeAction(Organisation $organisation, Request $request, Event
         //process form
         $form = $this->handleDeleteForm($request, $event);
         if ($form === null) {
-            return $this->redirectToRoute('organisation_view', ["organisation" => $organisation->getId()]);
+            return $this->redirectToRoute('organisation_view', ['organisation' => $organisation->getId()]);
         }
 
         $this->organisation = $organisation;
+
         return $this->render('organisation/event/remove.html.twig', ['form' => $form->createView(), 'event' => $event]);
     }
 
     private function validateEvent(Event $event, TranslatorInterface $translator): bool
     {
-        if (strlen($event->getNameDe()) === 0 && strlen($event->getNameEn()) === 0) {
-            $this->displayError($translator->trans("new.error.no_name", [], "organisation_event"));
+        if (\mb_strlen($event->getNameDe()) === 0 && \mb_strlen($event->getNameEn()) === 0) {
+            $this->displayError($translator->trans('new.error.no_name', [], 'organisation_event'));
+
             return false;
         }
 
@@ -142,7 +144,7 @@ protected function getIndexBreadcrumbs()
         // test in frontend
         return array_merge(parent::getIndexBreadcrumbs(), [
             new Breadcrumb(
-                $this->generateUrl('organisation_view', ["organisation" => $this->organisation->getId()]),
+                $this->generateUrl('organisation_view', ['organisation' => $this->organisation->getId()]),
                 $this->getTranslator()->trans('view.title', [], 'organisation')
             ),
         ]);

diff --git a/src/Controller/OrganisationController.php b/src/Controller/OrganisationController.php
@@ -36,7 +36,7 @@ public function viewAction(Request $request, Organisation $organisation)
 
         $output = [];
 
-        $hasSemesterReport = $this->getDoctrine()->getRepository(SemesterReport::class)->findOneBy(["organisation" => $organisation->getId(), "semester" => SemesterType::getCurrentSemester()]);
+        $hasSemesterReport = $this->getDoctrine()->getRepository(SemesterReport::class)->findOneBy(['organisation' => $organisation->getId(), 'semester' => SemesterType::getCurrentSemester()]);
         if (!$hasSemesterReport) {
             //allow semester creation
             $semester = new SemesterReport();
@@ -46,22 +46,20 @@ public function viewAction(Request $request, Organisation $organisation)
             $hasSaved = false;
             $form = $this->handleCreateForm($request, $semester, function () use (&$hasSaved) {
                 $hasSaved = true;
+
                 return true;
             });
 
             if (!$hasSaved) {
-                $output["submit_semester_report"] = $form->createView();
+                $output['submit_semester_report'] = $form->createView();
             }
         }
 
-        $output["organisation"] = $organisation;
+        $output['organisation'] = $organisation;
 
         return $this->render('organisation/view.html.twig', $output);
     }
 
-    /**
-     * @param Organisation $event
-     */
     private function ensureAccessGranted(Organisation $event)
     {
         $this->denyAccessUnlessGranted(BaseVoter::VIEW, $event);

diff --git a/src/Entity/Event.php b/src/Entity/Event.php
@@ -103,9 +103,6 @@ class Event extends BaseEntity
      */
     private $organisation;
 
-    /**
-     * @return int
-     */
     public function getSemester(): int
     {
         return $this->semester;
@@ -119,9 +116,6 @@ public function getSemesterName(): string
         return SemesterType::semesterToString($this->getSemester());
     }
 
-    /**
-     * @param int $semester
-     */
     public function setSemester(int $semester): void
     {
         $this->semester = $semester;
@@ -135,33 +129,21 @@ public function getName()
         return $this->getNameDe() !== null ? $this->getNameDe() : $this->getNameEn();
     }
 
-    /**
-     * @return string|null
-     */
     public function getNameDe(): ?string
     {
         return $this->nameDe;
     }
 
-    /**
-     * @param string|null $nameDe
-     */
     public function setNameDe(?string $nameDe): void
     {
         $this->nameDe = $nameDe;
     }
 
-    /**
-     * @return string|null
-     */
     public function getNameEn(): ?string
     {
         return $this->nameEn;
     }
 
-    /**
-     * @param string|null $nameEn
-     */
     public function setNameEn(?string $nameEn): void
     {
         $this->nameEn = $nameEn;
@@ -175,132 +157,83 @@ public function getDescription()
         return $this->getDescriptionDe() !== null ? $this->getDescriptionDe() : $this->getDescriptionEn();
     }
 
-    /**
-     * @return string|null
-     */
     public function getDescriptionDe(): ?string
     {
         return $this->descriptionDe;
     }
 
-    /**
-     * @param string|null $descriptionDe
-     */
     public function setDescriptionDe(?string $descriptionDe): void
     {
         $this->descriptionDe = $descriptionDe;
     }
 
-    /**
-     * @return string|null
-     */
     public function getDescriptionEn(): ?string
     {
         return $this->descriptionEn;
     }
 
-    /**
-     * @param string|null $descriptionEn
-     */
     public function setDescriptionEn(?string $descriptionEn): void
     {
         $this->descriptionEn = $descriptionEn;
     }
 
-    /**
-     * @return string
-     */
     public function getLocation(): string
     {
         return $this->location;
     }
 
-    /**
-     * @param string $location
-     */
     public function setLocation(string $location): void
     {
         $this->location = $location;
     }
 
-    /**
-     * @return \DateTime|null
-     */
     public function getStartDate(): ?\DateTime
     {
         return $this->startDate;
     }
 
-    /**
-     * @param \DateTime|null $startDate
-     */
     public function setStartDate(?\DateTime $startDate): void
     {
         $this->startDate = $startDate;
     }
 
-    /**
-     * @return \DateTime|null
-     */
     public function getEndDate(): ?\DateTime
     {
         return $this->endDate;
     }
 
-    /**
-     * @param \DateTime|null $endDate
-     */
     public function setEndDate(?\DateTime $endDate): void
     {
         $this->endDate = $endDate;
     }
 
-    /**
-     * @return int
-     */
     public function getBudget(): int
     {
         return $this->budget;
     }
 
-    /**
-     * @param int $budget
-     */
     public function setBudget(int $budget): void
     {
         $this->budget = $budget;
     }
 
-    /**
-     * @return bool
-     */
     public function isNeedFinancialSupport(): bool
     {
         return $this->needFinancialSupport;
     }
 
-    /**
-     * @param bool $needFinancialSupport
-     */
     public function setNeedFinancialSupport(bool $needFinancialSupport): void
     {
         $this->needFinancialSupport = $needFinancialSupport;
     }
 
-    /**
-     * @return Organisation
-     */
     public function getOrganisation(): Organisation
     {
         return $this->organisation;
     }
 
-    /**
-     * @param Organisation $organisation
-     */
     public function setOrganisation(Organisation $organisation): void
     {
         $this->organisation = $organisation;
     }
-
 }