Piou-piou / RibsAdminBundle

Service/Version.php

Indentation +94 added lines, -94 removed lines

@@ -6,98 +6,98 @@
 
 class Version
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * Version constructor.
-     * @param EntityManagerInterface $em
-     */
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
-
-    /**
-     * @return mixed|null
-     */
-    private function getComposerLockJson()
-    {
-        $composer_lock = file_get_contents('../composer.lock');
-
-        if ($composer_lock) {
-            return json_decode($composer_lock, true);
-        }
-
-        return null;
-    }
-
-    /**
-     * @param $package_name
-     * @return mixed|null
-     */
-    private function getPackage($package_name)
-    {
-        $composer_lock = $this->getComposerLockJson();
-        if ($composer_lock) {
-            $packages = $composer_lock["packages"];
-            $key = array_search($package_name, array_column($packages, 'name'));
-
-            if ($key) {
-                return $packages[$key];
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @param $package_name
-     * @return mixed|null
-     */
-    public function getVersion($package_name)
-    {
-        return $this->getPackage($package_name) ? $this->getPackage($package_name)["version"] : null;
-    }
-
-    /**
-     * @param $package_name
-     * @return mixed|null
-     */
-    public function getVersionDate($package_name)
-    {
-        $string_date = $this->getPackage($package_name) ? explode("T", $this->getPackage($package_name)["time"])[0] : null;
-        $version_date = null;
-
-        if ($string_date) {
-            $version_date = new \DateTime($string_date);
-        }
-
-        return $version_date;
-    }
-
-    /**
-     * @param $package_name
-     */
-    public function save($package_name)
-    {
-        $version = $this->em->getRepository(\PiouPiou\RibsAdminBundle\Entity\Version::class)->findOneBy(["package_name" => $package_name]);
-
-        if (!$version) {
-            $version = new \PiouPiou\RibsAdminBundle\Entity\Version();
-            $version->setProjectName($package_name);
-            $version->setPackageName($package_name);
-            $version->setProjectUrl($package_name);
-            $version->setCheckVersionUrl($package_name);
-        }
-
-        $version->setVersion($this->getVersion($package_name));
-        $version->setVersionDate($this->getVersionDate($package_name));
-        $version->setLastCheck(new \DateTime());
-
-        $this->em->persist($version);
-        $this->em->flush();
-    }
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * Version constructor.
+				 * @param EntityManagerInterface $em
+				 */
+				public function __construct(EntityManagerInterface $em)
+				{
+								$this->em = $em;
+				}
+
+				/**
+				 * @return mixed|null
+				 */
+				private function getComposerLockJson()
+				{
+								$composer_lock = file_get_contents('../composer.lock');
+
+								if ($composer_lock) {
+												return json_decode($composer_lock, true);
+								}
+
+								return null;
+				}
+
+				/**
+				 * @param $package_name
+				 * @return mixed|null
+				 */
+				private function getPackage($package_name)
+				{
+								$composer_lock = $this->getComposerLockJson();
+								if ($composer_lock) {
+												$packages = $composer_lock["packages"];
+												$key = array_search($package_name, array_column($packages, 'name'));
+
+												if ($key) {
+																return $packages[$key];
+												}
+								}
+
+								return null;
+				}
+
+				/**
+				 * @param $package_name
+				 * @return mixed|null
+				 */
+				public function getVersion($package_name)
+				{
+								return $this->getPackage($package_name) ? $this->getPackage($package_name)["version"] : null;
+				}
+
+				/**
+				 * @param $package_name
+				 * @return mixed|null
+				 */
+				public function getVersionDate($package_name)
+				{
+								$string_date = $this->getPackage($package_name) ? explode("T", $this->getPackage($package_name)["time"])[0] : null;
+								$version_date = null;
+
+								if ($string_date) {
+												$version_date = new \DateTime($string_date);
+								}
+
+								return $version_date;
+				}
+
+				/**
+				 * @param $package_name
+				 */
+				public function save($package_name)
+				{
+								$version = $this->em->getRepository(\PiouPiou\RibsAdminBundle\Entity\Version::class)->findOneBy(["package_name" => $package_name]);
+
+								if (!$version) {
+												$version = new \PiouPiou\RibsAdminBundle\Entity\Version();
+												$version->setProjectName($package_name);
+												$version->setPackageName($package_name);
+												$version->setProjectUrl($package_name);
+												$version->setCheckVersionUrl($package_name);
+								}
+
+								$version->setVersion($this->getVersion($package_name));
+								$version->setVersionDate($this->getVersionDate($package_name));
+								$version->setLastCheck(new \DateTime());
+
+								$this->em->persist($version);
+								$this->em->flush();
+				}
 }

Service/AccessRights.php

Indentation +40 added lines, -40 removed lines

@@ -43,10 +43,10 @@ 
 	 */
 	private $module;
 
-    /**
-     * @var Api
-     */
-    private $api;
+				/**
+				 * @var Api
+				 */
+				private $api;
 	
 	/**
 	 * @var User
@@ -56,17 +56,17 @@ 
 	/** @var TokenStorageInterface */
 	private $token_storage;
 
-    /**
-     * AccessRights constructor.
-     * @param ContainerInterface $container
-     * @param RouterInterface $router
-     * @param SessionInterface $session
-     * @param RequestStack $request
-     * @param TokenStorageInterface $tokenStorage
-     * @param Globals $globals
-     * @param ModuleService $module
-     * @param Api $api
-     */
+				/**
+				 * AccessRights constructor.
+				 * @param ContainerInterface $container
+				 * @param RouterInterface $router
+				 * @param SessionInterface $session
+				 * @param RequestStack $request
+				 * @param TokenStorageInterface $tokenStorage
+				 * @param Globals $globals
+				 * @param ModuleService $module
+				 * @param Api $api
+				 */
 	public function __construct(ContainerInterface $container, RouterInterface $router, SessionInterface $session, RequestStack $request, TokenStorageInterface $tokenStorage, Globals $globals, ModuleService $module, Api $api)
 	{
 		$this->container = $container;
@@ -78,8 +78,8 @@ 
 		$this->api = $api;
 		$this->token_storage = $tokenStorage;
 		if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
-            $this->user = $this->token_storage->getToken()->getUser()->getUser();
-        }
+												$this->user = $this->token_storage->getToken()->getUser()->getUser();
+								}
 	}
 	
 	public function onKernelController()
@@ -107,8 +107,8 @@ 
 			$this->user = $this->token_storage->getToken()->getUser()->getUser();
 
 			if ($this->testIsOpenUrl($route)) {
-			    return;
-            }
+							return;
+												}
 			
 			$route_right = $this->in_array_recursive($route, $ribs_admin_rights);
 			
@@ -124,25 +124,25 @@ 
 			
 			throw new AccessDeniedException("No access");
 		} else if ($api && strpos($route, "login") === false && strpos($route, "register") === false) {
-            if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
-                throw new AccessDeniedException("User is not connected");
-            }
-        }
+												if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
+																throw new AccessDeniedException("User is not connected");
+												}
+								}
 	}
 
 	private function testIsOpenUrl($route)
-    {
-        $open_urls = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_open_url.json"), true);
+				{
+								$open_urls = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_open_url.json"), true);
 
-        if ($open_urls && $open_urls["items"] && in_array($route, $open_urls["items"])) {
-            return true;
-        }
+								if ($open_urls && $open_urls["items"] && in_array($route, $open_urls["items"])) {
+												return true;
+								}
 
-        return false;
-    }
+								return false;
+				}
 	
 	/**
-     * function that allow to test a right directly in the view
+	 * function that allow to test a right directly in the view
 	 * @param string $right
 	 * @return bool
 	 */
@@ -153,9 +153,9 @@ 
 		
 		$all_rights = array_merge($user_rights, $list_rights);
 
-        if (in_array("*", $all_rights)) {
-            return true;
-        }
+								if (in_array("*", $all_rights)) {
+												return true;
+								}
 
 		if (in_array($right, $all_rights)) {
 			return true;
@@ -165,7 +165,7 @@ 
 	}
 	
 	/**
-     * test if route_right is found in users rights
+	 * test if route_right is found in users rights
 	 * @param array $route_right
 	 * @return bool
 	 */
@@ -177,8 +177,8 @@ 
 		$all_rights = array_merge($user_rights, $list_rights);
 
 		if (in_array("*", $all_rights)) {
-		    return true;
-        }
+						return true;
+								}
 
 		foreach ($all_rights as $right) {
 			if (in_array($right, $route_right)) {
@@ -190,7 +190,7 @@ 
 	}
 	
 	/**
-     * function that search if the right contain an url or more
+	 * function that search if the right contain an url or more
 	 * @param $needle
 	 * @param $haystack
 	 * @return bool|mixed
@@ -214,7 +214,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all user rights or empty array if no right found
+	 * function that retun a array that contain all user rights or empty array if no right found
 	 * @return array
 	 */
 	private function getUserRights(): array
@@ -229,7 +229,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all rights of rattached list right of the current user
+	 * function that retun a array that contain all rights of rattached list right of the current user
 	 * @return array
 	 */
 	private function getRightsListOfUser(): array

Controller/VersionController.php

Indentation +110 added lines, -110 removed lines

@@ -14,115 +14,115 @@
 
 class VersionController extends AbstractController
 {
-    /**
-     * @Route("/versions/", name="ribsadmin_versions")
-     * @param EntityManagerInterface $em
-     * @return Response
-     */
-    public function index(EntityManagerInterface $em): Response
-    {
-        $versions = $em->getRepository(Version::class)->findAll();
+				/**
+				 * @Route("/versions/", name="ribsadmin_versions")
+				 * @param EntityManagerInterface $em
+				 * @return Response
+				 */
+				public function index(EntityManagerInterface $em): Response
+				{
+								$versions = $em->getRepository(Version::class)->findAll();
         
-        return $this->render("@RibsAdmin/versions/list.html.twig", ["verions" => $versions]);
-    }
-
-    /**
-     * @Route("/versions/create/", name="ribsadmin_versions_create")
-     * @Route("/versions/show/{guid}", name="ribsadmin_versions_show")
-     * @Route("/versions/edit/{guid}", name="ribsadmin_versions_edit")
-     * @param Request $request
-     * @param EntityManagerInterface $em
-     * @param string|null $guid
-     * @return Response
-     */
-    public function edit(Request $request, EntityManagerInterface $em, string $guid = null): Response
-    {
-        if (!$guid) {
-            $version = new Version();
-            $text = "created";
-        } else {
-            $version = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
-            $text = "edited";
-        }
-
-        $form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Version::class, $version);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var Version $data */
-            $data = $form->getData();
-            $em->persist($data);
-            $em->flush();
-            $this->addFlash("success-flash", "Version " . $data->getProjectName() . " was " . $text);
-
-            return $this->redirectToRoute("ribsadmin_versions");
-        }
-
-        return $this->render("@RibsAdmin/versions/edit.html.twig", [
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "version" => $version
-        ]);
-    }
-
-    /**
-     * @Route("/versions/delete/{guid}", name="ribsadmin_versions_delete")
-     * @param EntityManagerInterface $em
-     * @param string $guid
-     * @return RedirectResponse
-     */
-    public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
-    {
-        $version = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
-
-        if ($version) {
-            $em->remove($version);
-            $em->flush();
-            $this->addFlash("success-flash", "The project version was deleted");
-        } else {
-            $this->addFlash("error-flash", "The project version was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_versions");
-    }
-
-    /**
-     * @Route("/versions/update/{guid}", name="ribsadmin_versions_update")
-     * @param EntityManagerInterface $em
-     * @param \PiouPiou\RibsAdminBundle\Service\Version $version
-     * @param string $guid
-     * @return RedirectResponse
-     */
-    public function updateVersion(EntityManagerInterface $em, \PiouPiou\RibsAdminBundle\Service\Version $version, string $guid): RedirectResponse
-    {
-        $version_entity = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
-
-        if ($version_entity) {
-            $version_entity->setVersion($version->getVersion($version_entity->getPackageName()));
-            $version_entity->setVersionDate($version->getVersionDate($version_entity->getPackageName()));
-            $version_entity->setLastCheck(new \DateTime());
-            $em->persist($version_entity);
-            $em->flush();
-
-            $this->addFlash("success-flash", "The project version was updated");
-        } else {
-            $this->addFlash("error-flash", "The project version was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_versions");
-    }
-
-    /**
-     * @Route("/versions/send-version/{package_name}", name="ribsadmin_versions_send", requirements={"package_name"=".+"})
-     * @param \PiouPiou\RibsAdminBundle\Service\Version $version
-     * @param string $package_name
-     * @return mixed|null
-     */
-    public function sendPackageInformations(\PiouPiou\RibsAdminBundle\Service\Version $version, string $package_name): JsonResponse
-    {
-        return new JsonResponse([
-            "version" => $version->getVersion($package_name),
-            "version_date" => $version->getVersionDate($package_name)
-        ]);
-    }
+								return $this->render("@RibsAdmin/versions/list.html.twig", ["verions" => $versions]);
+				}
+
+				/**
+				 * @Route("/versions/create/", name="ribsadmin_versions_create")
+				 * @Route("/versions/show/{guid}", name="ribsadmin_versions_show")
+				 * @Route("/versions/edit/{guid}", name="ribsadmin_versions_edit")
+				 * @param Request $request
+				 * @param EntityManagerInterface $em
+				 * @param string|null $guid
+				 * @return Response
+				 */
+				public function edit(Request $request, EntityManagerInterface $em, string $guid = null): Response
+				{
+								if (!$guid) {
+												$version = new Version();
+												$text = "created";
+								} else {
+												$version = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
+												$text = "edited";
+								}
+
+								$form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Version::class, $version);
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												/** @var Version $data */
+												$data = $form->getData();
+												$em->persist($data);
+												$em->flush();
+												$this->addFlash("success-flash", "Version " . $data->getProjectName() . " was " . $text);
+
+												return $this->redirectToRoute("ribsadmin_versions");
+								}
+
+								return $this->render("@RibsAdmin/versions/edit.html.twig", [
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"version" => $version
+								]);
+				}
+
+				/**
+				 * @Route("/versions/delete/{guid}", name="ribsadmin_versions_delete")
+				 * @param EntityManagerInterface $em
+				 * @param string $guid
+				 * @return RedirectResponse
+				 */
+				public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
+				{
+								$version = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
+
+								if ($version) {
+												$em->remove($version);
+												$em->flush();
+												$this->addFlash("success-flash", "The project version was deleted");
+								} else {
+												$this->addFlash("error-flash", "The project version was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_versions");
+				}
+
+				/**
+				 * @Route("/versions/update/{guid}", name="ribsadmin_versions_update")
+				 * @param EntityManagerInterface $em
+				 * @param \PiouPiou\RibsAdminBundle\Service\Version $version
+				 * @param string $guid
+				 * @return RedirectResponse
+				 */
+				public function updateVersion(EntityManagerInterface $em, \PiouPiou\RibsAdminBundle\Service\Version $version, string $guid): RedirectResponse
+				{
+								$version_entity = $em->getRepository(Version::class)->findOneBy(["guid" => $guid]);
+
+								if ($version_entity) {
+												$version_entity->setVersion($version->getVersion($version_entity->getPackageName()));
+												$version_entity->setVersionDate($version->getVersionDate($version_entity->getPackageName()));
+												$version_entity->setLastCheck(new \DateTime());
+												$em->persist($version_entity);
+												$em->flush();
+
+												$this->addFlash("success-flash", "The project version was updated");
+								} else {
+												$this->addFlash("error-flash", "The project version was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_versions");
+				}
+
+				/**
+				 * @Route("/versions/send-version/{package_name}", name="ribsadmin_versions_send", requirements={"package_name"=".+"})
+				 * @param \PiouPiou\RibsAdminBundle\Service\Version $version
+				 * @param string $package_name
+				 * @return mixed|null
+				 */
+				public function sendPackageInformations(\PiouPiou\RibsAdminBundle\Service\Version $version, string $package_name): JsonResponse
+				{
+								return new JsonResponse([
+												"version" => $version->getVersion($package_name),
+												"version_date" => $version->getVersionDate($package_name)
+								]);
+				}
 }