Piou-piou / RibsAdminBundle

Controller/PackagesDistController.php

Indentation +107 added lines, -107 removed lines

@@ -21,111 +21,111 @@
 
 class PackagesDistController extends AbstractController
 {
-    /**
-     * @Route("/packages/dist/send-package/{package_name}", name="ribsadmin_packages_dist_send", requirements={"package_name"=".+"})
-     * @param EntityManagerInterface $em
-     * @param Version $version
-     * @param string $package_name
-     * @return mixed|null
-     * @throws Exception
-     */
-    public function sendPackageInformations(EntityManagerInterface $em, Version $version, string $package_name): JsonResponse
-    {
-        $package = $em->getRepository(Package::class)->findOneBy(["package_name" => $package_name]);
-
-        if ($package) {
-            $version->setPackageEntity($package);
-        }
-
-        return new JsonResponse([
-            "package" => $version->getPackage(),
-            "package_date" => $version->getVersionDate()
-        ]);
-    }
-
-    /**
-     * @Route("/packages/dist/send-composer-lock/", name="ribsadmin_packages_dist_send_composer_lock")
-     * @return JsonResponse
-     */
-    public function sendComposerJson(): JsonResponse
-    {
-        $composer_lock = file_get_contents('../composer.lock');
-
-        if ($composer_lock) {
-            $composer_lock = json_decode($composer_lock);
-        }
-
-        return new JsonResponse($composer_lock);
-    }
-
-    /**
-     * @Route("/packages/dist/send-token/", name="ribsadmin_packages_dist_send_token")
-     * @param ParameterBagInterface $parameter
-     * @return JsonResponse
-     */
-    public function sendToken(ParameterBagInterface $parameter): JsonResponse
-    {
-        return new JsonResponse([
-            "token" => $parameter->get("ribs_admin.packages_token")
-        ]);
-    }
-
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    private function uploadConfigFile($file, $folder)
-    {
-        $success = true;
-        if ($file) {
-            try {
-                $file->move('../config/'.$folder, $file->getClientOriginalName());
-            } catch (FileException $exception) {
-                $success = false;
-            }
-        }
-        return $success;
-    }
-
-    /**
-     * @Route("/packages/dist/change-version/", name="ribsadmin_packages_dist_change_version", requirements={"package_name"=".+"}, methods={"POST"})
-     * @param KernelInterface $kernel
-     * @param Request $request
-     * @return JsonResponse
-     * @throws Exception
-     */
-    public function changePackageVersion(KernelInterface $kernel, Request $request): JsonResponse
-    {
-        $application = new Application($kernel);
-        $application->setAutoExit(false);
-
-        $package_name = $request->get("package_name");
-        $version = $request->get("version");
-
-        if (!$this->uploadConfigFile($request->files->get('package_routes'), "routes")) {
-            return new JsonResponse([
-                "error_message" => "Routes file move is impossible"
-            ]);
-        }
-
-        if (!$this->uploadConfigFile($request->files->get('package_config'), "packages")) {
-            return new JsonResponse([
-                "error_message" => "Package file move is impossible"
-            ]);
-        }
-
-        $input = new ArrayInput([
-            'command' => 'ribsadmin:change-package-version',
-            'package-name' => $package_name.":".$version,
-        ]);
-
-        $output = new BufferedOutput(OutputInterface::VERBOSITY_NORMAL, true);
-        $application->run($input, $output);
-
-        $converter = new AnsiToHtmlConverter();
-        $content = $output->fetch();
-
-        return new JsonResponse($converter->convert($content));
-    }
+				/**
+				 * @Route("/packages/dist/send-package/{package_name}", name="ribsadmin_packages_dist_send", requirements={"package_name"=".+"})
+				 * @param EntityManagerInterface $em
+				 * @param Version $version
+				 * @param string $package_name
+				 * @return mixed|null
+				 * @throws Exception
+				 */
+				public function sendPackageInformations(EntityManagerInterface $em, Version $version, string $package_name): JsonResponse
+				{
+								$package = $em->getRepository(Package::class)->findOneBy(["package_name" => $package_name]);
+
+								if ($package) {
+												$version->setPackageEntity($package);
+								}
+
+								return new JsonResponse([
+												"package" => $version->getPackage(),
+												"package_date" => $version->getVersionDate()
+								]);
+				}
+
+				/**
+				 * @Route("/packages/dist/send-composer-lock/", name="ribsadmin_packages_dist_send_composer_lock")
+				 * @return JsonResponse
+				 */
+				public function sendComposerJson(): JsonResponse
+				{
+								$composer_lock = file_get_contents('../composer.lock');
+
+								if ($composer_lock) {
+												$composer_lock = json_decode($composer_lock);
+								}
+
+								return new JsonResponse($composer_lock);
+				}
+
+				/**
+				 * @Route("/packages/dist/send-token/", name="ribsadmin_packages_dist_send_token")
+				 * @param ParameterBagInterface $parameter
+				 * @return JsonResponse
+				 */
+				public function sendToken(ParameterBagInterface $parameter): JsonResponse
+				{
+								return new JsonResponse([
+												"token" => $parameter->get("ribs_admin.packages_token")
+								]);
+				}
+
+				/**
+				 * @param $file
+				 * @param $folder
+				 * @return bool
+				 */
+				private function uploadConfigFile($file, $folder)
+				{
+								$success = true;
+								if ($file) {
+												try {
+																$file->move('../config/'.$folder, $file->getClientOriginalName());
+												} catch (FileException $exception) {
+																$success = false;
+												}
+								}
+								return $success;
+				}
+
+				/**
+				 * @Route("/packages/dist/change-version/", name="ribsadmin_packages_dist_change_version", requirements={"package_name"=".+"}, methods={"POST"})
+				 * @param KernelInterface $kernel
+				 * @param Request $request
+				 * @return JsonResponse
+				 * @throws Exception
+				 */
+				public function changePackageVersion(KernelInterface $kernel, Request $request): JsonResponse
+				{
+								$application = new Application($kernel);
+								$application->setAutoExit(false);
+
+								$package_name = $request->get("package_name");
+								$version = $request->get("version");
+
+								if (!$this->uploadConfigFile($request->files->get('package_routes'), "routes")) {
+												return new JsonResponse([
+																"error_message" => "Routes file move is impossible"
+												]);
+								}
+
+								if (!$this->uploadConfigFile($request->files->get('package_config'), "packages")) {
+												return new JsonResponse([
+																"error_message" => "Package file move is impossible"
+												]);
+								}
+
+								$input = new ArrayInput([
+												'command' => 'ribsadmin:change-package-version',
+												'package-name' => $package_name.":".$version,
+								]);
+
+								$output = new BufferedOutput(OutputInterface::VERBOSITY_NORMAL, true);
+								$application->run($input, $output);
+
+								$converter = new AnsiToHtmlConverter();
+								$content = $output->fetch();
+
+								return new JsonResponse($converter->convert($content));
+				}
 }

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
         $success = true;
         if ($file) {
             try {
-                $file->move('../config/'.$folder, $file->getClientOriginalName());
+                $file->move('../config/' . $folder, $file->getClientOriginalName());
             } catch (FileException $exception) {
                 $success = false;
             }
@@ -117,7 +117,7 @@ 
 
         $input = new ArrayInput([
             'command' => 'ribsadmin:change-package-version',
-            'package-name' => $package_name.":".$version,
+            'package-name' => $package_name . ":" . $version,
         ]);
 
         $output = new BufferedOutput(OutputInterface::VERBOSITY_NORMAL, true);

EventListener/ExceptionListener.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_URL, $slack_webhook);
             curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json','Content-Length: ' . strlen($data_json)));
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json', 'Content-Length: ' . strlen($data_json)));
             curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
             curl_exec($ch);

Indentation +46 added lines, -46 removed lines

@@ -9,50 +9,50 @@
 
 class ExceptionListener
 {
-    /**
-     * @var ParameterBagInterface
-     */
-    private $paramter;
-
-    /**
-     * @var User
-     */
-    private $user;
-
-    public function __construct(ParameterBagInterface $parameterBag, TokenStorageInterface $tokenStorage)
-    {
-        $this->paramter = $parameterBag;
-        if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
-            $this->user = $tokenStorage->getToken()->getUser()->getUser();
-        }
-    }
-
-    public function onKernelException(ExceptionEvent $event)
-    {
-        $slack_webhook = $this->paramter->get('ribs_admin.slack_webhook');
-        if ($slack_webhook) {
-            $data = array();
-            $data['channel'] = '#errors';
-            $data['username'] = $_SERVER['HTTP_HOST'];
-            $data['text'] = "• *Erreur* : " . strip_tags($event->getThrowable()->getMessage());
-            $data['text'] .= "\n• *Erreur File* : " . strip_tags($event->getThrowable()->getFile()) . " at line :" . strip_tags($event->getThrowable()->getLine());
-            $data['text'] .= "\n• *URL* : " . $event->getRequest()->getUri();
-
-            if ($this->user) {
-                $data['text'] .= "\n• *Utilisateur* : " . $this->user . " with id : " . $this->user->getId();
-            }
-
-            $data['unfurl_links'] = false;
-            $data_json = json_encode($data);
-
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, $slack_webhook);
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json','Content-Length: ' . strlen($data_json)));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_exec($ch);
-            curl_close($ch);
-        }
-    }
+				/**
+				 * @var ParameterBagInterface
+				 */
+				private $paramter;
+
+				/**
+				 * @var User
+				 */
+				private $user;
+
+				public function __construct(ParameterBagInterface $parameterBag, TokenStorageInterface $tokenStorage)
+				{
+								$this->paramter = $parameterBag;
+								if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
+												$this->user = $tokenStorage->getToken()->getUser()->getUser();
+								}
+				}
+
+				public function onKernelException(ExceptionEvent $event)
+				{
+								$slack_webhook = $this->paramter->get('ribs_admin.slack_webhook');
+								if ($slack_webhook) {
+												$data = array();
+												$data['channel'] = '#errors';
+												$data['username'] = $_SERVER['HTTP_HOST'];
+												$data['text'] = "• *Erreur* : " . strip_tags($event->getThrowable()->getMessage());
+												$data['text'] .= "\n• *Erreur File* : " . strip_tags($event->getThrowable()->getFile()) . " at line :" . strip_tags($event->getThrowable()->getLine());
+												$data['text'] .= "\n• *URL* : " . $event->getRequest()->getUri();
+
+												if ($this->user) {
+																$data['text'] .= "\n• *Utilisateur* : " . $this->user . " with id : " . $this->user->getId();
+												}
+
+												$data['unfurl_links'] = false;
+												$data_json = json_encode($data);
+
+												$ch = curl_init();
+												curl_setopt($ch, CURLOPT_URL, $slack_webhook);
+												curl_setopt($ch, CURLOPT_POST, 1);
+												curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json','Content-Length: ' . strlen($data_json)));
+												curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json);
+												curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+												curl_exec($ch);
+												curl_close($ch);
+								}
+				}
 }
\ No newline at end of file

EventListener/CreateUpdateAwareListener.php

Indentation +36 added lines, -36 removed lines

@@ -7,43 +7,43 @@
 
 class CreateUpdateAwareListener
 {
-    /**
-     * @var User
-     */
-    private $user;
+				/**
+				 * @var User
+				 */
+				private $user;
 
-    /**
-     * CreateUpdateAwareListener constructor.
-     * @param TokenStorageInterface $tokenStorage
-     */
-    public function __construct(TokenStorageInterface $tokenStorage)
-    {
-        if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
-            $this->user = $tokenStorage->getToken()->getUser()->getUser();
-        } else {
-            $this->user = null;
-        }
-    }
+				/**
+				 * CreateUpdateAwareListener constructor.
+				 * @param TokenStorageInterface $tokenStorage
+				 */
+				public function __construct(TokenStorageInterface $tokenStorage)
+				{
+								if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
+												$this->user = $tokenStorage->getToken()->getUser()->getUser();
+								} else {
+												$this->user = null;
+								}
+				}
 
-    public function prePersist($entity)
-    {
-        if ($this->user) {
-            if ($entity->getCreatedBy() === null) {
-                $entity->setCreatedAt(new \DateTime());
-                $entity->setCreatedBy($this->user);
-            }
-            if ($entity->getUpdatedBy() === null) {
-                $entity->setUpdatedAt(new \DateTime());
-                $entity->setUpdatedBy($this->user);
-            }
-        }
-    }
+				public function prePersist($entity)
+				{
+								if ($this->user) {
+												if ($entity->getCreatedBy() === null) {
+																$entity->setCreatedAt(new \DateTime());
+																$entity->setCreatedBy($this->user);
+												}
+												if ($entity->getUpdatedBy() === null) {
+																$entity->setUpdatedAt(new \DateTime());
+																$entity->setUpdatedBy($this->user);
+												}
+								}
+				}
 
-    public function preUpdate($entity)
-    {
-        if ($this->user) {
-            $entity->setUpdatedAt(new \DateTime());
-            $entity->setUpdatedBy($this->user);
-        }
-    }
+				public function preUpdate($entity)
+				{
+								if ($this->user) {
+												$entity->setUpdatedAt(new \DateTime());
+												$entity->setUpdatedBy($this->user);
+								}
+				}
 }

Controller/NavigationBuilderController.php

Indentation +45 added lines, -45 removed lines

@@ -10,49 +10,49 @@
 
 class NavigationBuilderController extends AbstractController
 {
-    private $nav = [];
-
-    /**
-     * function that display the left navigation mapped by user rights
-     * @param Globals $globals
-     * @param AccessRights $access_rights
-     * @return Response
-     */
-    public function getLeftNavigation(Globals $globals, AccessRights $access_rights): Response
-    {
-        $navigation = json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/navigation.json"), true);
-
-        foreach ($navigation["items"] as $item) {
-            if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
-                $this->nav[] = $item;
-            }
-        }
-
-        $this->getModuleNavigation($access_rights);
-
-        return $this->render("@RibsAdmin/navigation.html.twig", ["navigation" => $this->nav]);
-    }
-
-    /**
-     * to get all modules navigation and test right navigation
-     * @param AccessRights $access_rights
-     */
-    private function getModuleNavigation(AccessRights $access_rights)
-    {
-        $modules = $this->getDoctrine()->getRepository(Module::class)->findBy([
-            "active" => true,
-            "displayed" => true
-        ]);
-
-        foreach ($modules as $module) {
-            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
-                ($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
-
-            foreach ($navigation["items"] as $item) {
-                if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
-                    $this->nav[] = $item;
-                }
-            }
-        }
-    }
+				private $nav = [];
+
+				/**
+				 * function that display the left navigation mapped by user rights
+				 * @param Globals $globals
+				 * @param AccessRights $access_rights
+				 * @return Response
+				 */
+				public function getLeftNavigation(Globals $globals, AccessRights $access_rights): Response
+				{
+								$navigation = json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/navigation.json"), true);
+
+								foreach ($navigation["items"] as $item) {
+												if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
+																$this->nav[] = $item;
+												}
+								}
+
+								$this->getModuleNavigation($access_rights);
+
+								return $this->render("@RibsAdmin/navigation.html.twig", ["navigation" => $this->nav]);
+				}
+
+				/**
+				 * to get all modules navigation and test right navigation
+				 * @param AccessRights $access_rights
+				 */
+				private function getModuleNavigation(AccessRights $access_rights)
+				{
+								$modules = $this->getDoctrine()->getRepository(Module::class)->findBy([
+												"active" => true,
+												"displayed" => true
+								]);
+
+								foreach ($modules as $module) {
+												$navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
+																($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
+
+												foreach ($navigation["items"] as $item) {
+																if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
+																				$this->nav[] = $item;
+																}
+												}
+								}
+				}
 }

Spacing +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
         ]);
 
         foreach ($modules as $module) {
-            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
-                ($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
+            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
 
             foreach ($navigation["items"] as $item) {
                 if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {