Piou-piou / RibsAdminBundle

Controller/AccessRightsController.php

Indentation +116 added lines, -116 removed lines

@@ -13,120 +13,120 @@
 
 class AccessRightsController extends AbstractController
 {
-    /**
-     * @Route("/access-rights-management/", name="ribsadmin_access_rights")
-     * @return Response
-     */
-    public function list(): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $acces_right = $em->getRepository("RibsAdminBundle:AccessRight")->findAll();
-
-        return $this->render("@RibsAdmin/access-rights/list.html.twig", [
-            "access_right" => $acces_right
-        ]);
-    }
-
-    /**
-     * @Route("/access-rights-management/create/", name="ribsadmin_access_rights_create")
-     * @Route("/access-rights-management/show/{guid}", name="ribsadmin_access_rights_show")
-     * @Route("/access-rights-management/edit/{guid}", name="ribsadmin_access_rights_edit")
-     * @param Request $request
-     * @param Globals $globals
-     * @param ModuleService $module
-     * @param string|null $guid
-     * @return Response
-     */
-    public function edit(Request $request, Globals $globals, ModuleService $module, string $guid = null): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $list_rights_user = [];
-        $disabled_form = strpos($request->get("_route"), "_show") ? true : false;
-
-        if ($guid === null) {
-            $access_right = new AccessRight();
-        } else {
-            $access_right = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
-            $list_rights_user = explode(",", $access_right->getAccessRights());
-        }
-
-        $admins = $em->getRepository("RibsAdminBundle:User")->findBy(["admin" => true, "archived" => false]);
-
-        $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\AccessRight", $access_right, ["disabled" => $disabled_form]);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            return $this->handleEditForm($request, $access_right);
-        }
-
-        return $this->render("@RibsAdmin/access-rights/edit.html.twig", [
-            "access_right" => $access_right,
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "list_rights_user" => $list_rights_user,
-            "admins" => $admins,
-            "ribs_admin_rights" => json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")),
-            "modules" => $module->getAllInfosModules(),
-            "disabled_form" => $disabled_form
-        ]);
-    }
-
-    /**
-     * @Route("/access-rights-management/delete/{guid}", name="ribsadmin_access_rights_delete")
-     * @param string $guid
-     * @return RedirectResponse function that delete an access right list
-     */
-    public function delete(string $guid): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-        $list = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
-
-        if ($list) {
-            foreach ($list->getUsers() as $user) {
-                $user->setAccessRightList(null);
-            }
-
-            $em->remove($list);
-            $em->flush();
-
-            $this->addFlash("success-flash", "The right list was deleted");
-        } else {
-            $this->addFlash("error-flash", "The right list wasn't found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_access_rights");
-    }
-
-    /**
-     * @param Request $request
-     * @param AccessRight $access_right
-     * @return RedirectResponse function that handle the form request
-     */
-    private function handleEditForm(Request $request, AccessRight $access_right): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if ($request->get("right") === null) {
-            $rights = "";
-        } else {
-            $rights = implode(",", $request->get("right"));
-        }
-
-        $access_right->setAccessRights($rights);
-        $em->persist($access_right);
-        $em->flush();
-
-        $em->getRepository("RibsAdminBundle:AccessRight")->deleteAllUsersList($access_right);
-        $admins = $request->get("admins");
-
-        if ($admins !== null) {
-            foreach ($admins as $admin) {
-                $em->getRepository("RibsAdminBundle:AccessRight")->setAccessRightListUser($access_right->getId(), $admin);
-            }
-        }
-
-        $this->addFlash("success-flash", "The right list was correctly edited");
-
-        return $this->redirectToRoute("ribsadmin_access_rights");
-    }
+				/**
+				 * @Route("/access-rights-management/", name="ribsadmin_access_rights")
+				 * @return Response
+				 */
+				public function list(): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$acces_right = $em->getRepository("RibsAdminBundle:AccessRight")->findAll();
+
+								return $this->render("@RibsAdmin/access-rights/list.html.twig", [
+												"access_right" => $acces_right
+								]);
+				}
+
+				/**
+				 * @Route("/access-rights-management/create/", name="ribsadmin_access_rights_create")
+				 * @Route("/access-rights-management/show/{guid}", name="ribsadmin_access_rights_show")
+				 * @Route("/access-rights-management/edit/{guid}", name="ribsadmin_access_rights_edit")
+				 * @param Request $request
+				 * @param Globals $globals
+				 * @param ModuleService $module
+				 * @param string|null $guid
+				 * @return Response
+				 */
+				public function edit(Request $request, Globals $globals, ModuleService $module, string $guid = null): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$list_rights_user = [];
+								$disabled_form = strpos($request->get("_route"), "_show") ? true : false;
+
+								if ($guid === null) {
+												$access_right = new AccessRight();
+								} else {
+												$access_right = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
+												$list_rights_user = explode(",", $access_right->getAccessRights());
+								}
+
+								$admins = $em->getRepository("RibsAdminBundle:User")->findBy(["admin" => true, "archived" => false]);
+
+								$form = $this->createForm("PiouPiou\RibsAdminBundle\Form\AccessRight", $access_right, ["disabled" => $disabled_form]);
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												return $this->handleEditForm($request, $access_right);
+								}
+
+								return $this->render("@RibsAdmin/access-rights/edit.html.twig", [
+												"access_right" => $access_right,
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"list_rights_user" => $list_rights_user,
+												"admins" => $admins,
+												"ribs_admin_rights" => json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")),
+												"modules" => $module->getAllInfosModules(),
+												"disabled_form" => $disabled_form
+								]);
+				}
+
+				/**
+				 * @Route("/access-rights-management/delete/{guid}", name="ribsadmin_access_rights_delete")
+				 * @param string $guid
+				 * @return RedirectResponse function that delete an access right list
+				 */
+				public function delete(string $guid): RedirectResponse
+				{
+								$em = $this->getDoctrine()->getManager();
+								$list = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
+
+								if ($list) {
+												foreach ($list->getUsers() as $user) {
+																$user->setAccessRightList(null);
+												}
+
+												$em->remove($list);
+												$em->flush();
+
+												$this->addFlash("success-flash", "The right list was deleted");
+								} else {
+												$this->addFlash("error-flash", "The right list wasn't found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_access_rights");
+				}
+
+				/**
+				 * @param Request $request
+				 * @param AccessRight $access_right
+				 * @return RedirectResponse function that handle the form request
+				 */
+				private function handleEditForm(Request $request, AccessRight $access_right): RedirectResponse
+				{
+								$em = $this->getDoctrine()->getManager();
+
+								if ($request->get("right") === null) {
+												$rights = "";
+								} else {
+												$rights = implode(",", $request->get("right"));
+								}
+
+								$access_right->setAccessRights($rights);
+								$em->persist($access_right);
+								$em->flush();
+
+								$em->getRepository("RibsAdminBundle:AccessRight")->deleteAllUsersList($access_right);
+								$admins = $request->get("admins");
+
+								if ($admins !== null) {
+												foreach ($admins as $admin) {
+																$em->getRepository("RibsAdminBundle:AccessRight")->setAccessRightListUser($access_right->getId(), $admin);
+												}
+								}
+
+								$this->addFlash("success-flash", "The right list was correctly edited");
+
+								return $this->redirectToRoute("ribsadmin_access_rights");
+				}
 }

Controller/AccountsController.php

Indentation +125 added lines, -125 removed lines

@@ -12,129 +12,129 @@
 
 class AccountsController extends AbstractController
 {
-    /**
-     * @Route("/accounts/", name="ribsadmin_accounts")
-     * @return Response
-     */
-    public function list(): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $current_account = $this->getUser()->getUser();
-
-        $users = $em->getRepository("RibsAdminBundle:Account")->findAllUserArchived($current_account);
-        $users_archived = $em->getRepository("RibsAdminBundle:Account")->findAllUserArchived($current_account, true);
-
-        return $this->render('@RibsAdmin/accounts/list.html.twig', [
-            "users" => $users,
-            "users_archived" => $users_archived
-        ]);
-    }
-
-    /**
-     * @Route("/accounts/create/", name="ribsadmin_accounts_create")
-     * @Route("/accounts/show/{guid}", name="ribsadmin_accounts_show")
-     * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
-     * @param Request $request
-     * @param string|null $guid
-     * @return Response
-     */
-    public function edit(Request $request, string $guid = null): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $disabled_form = strpos($request->get("_route"), "_show") ? true : false;
-
-        if ($guid === null) {
-            $account = new Account();
-            $old_password = null;
-            $user = null;
-        } else {
-            $user = $em->getRepository(User::class)->findOneBy(["guid" => $guid]);
-            $account = $em->getRepository(Account::class)->findOneBy(["user" => $user->getId()]);
-            $old_password = $account->getPassword();
-        }
-
-        $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account,  ["disabled" => $disabled_form]);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /**
-             * @var Account
-             */
-            $data = $form->getData();
-
-            $account_exist = $em->getRepository(Account::class)->findOneBy(["username" => $data->getUsername()]);
-
-            if ($account_exist && $account_exist === $account) {
-                $account_exist = null;
-            }
-
-            if (!$account_exist) {
-                if ($guid === null) {
-                    $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
-                    $data->setPassword($temp_password);
-                } else if ($form->get("password")->getData()) {
-                    $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
-                    $data->setPassword($temp_password);
-                } else {
-                    $data->setPassword($old_password);
-                }
-
-                $em->persist($data);
-                $em->flush();
-
-                $username = $data->getUser()->getFirstName() . " " . $data->getUser()->getLastName();
-
-                if ($guid === null) {
-                    $this->addFlash("success-flash", "the account of " . $username . " was created");
-                } else {
-                    $this->addFlash("success-flash", "the account of " . $username . " was edited");
-                }
-
-                return $this->redirectToRoute("ribsadmin_accounts");
-            } else {
-                $this->addFlash("error-flash", "An account with username " . $data->getUsername() . " already exist");
-                return $this->redirectToRoute($request->get("_route"), ["guid" => $guid]);
-            }
-        }
-
-        return $this->render("@RibsAdmin/accounts/edit.html.twig", [
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "user" => $user,
-            "disabled_form" => $disabled_form
-        ]);
-    }
-
-    /**
-     * method to disable or enable a user
-     * @Route("/accounts/archive/{guid}/{activate}", name="ribsadmin_accounts_archive")
-     * @param string $guid
-     * @param bool $activate
-     * @return RedirectResponse
-     */
-    public function archive(string $guid, bool $activate = false): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $user = $em->getRepository("RibsAdminBundle:User")->findOneBy(["guid" => $guid]);
-
-        if ($user) {
-            if ($activate === true) {
-                $user->setArchived(false);
-                $word = "activated";
-            } else {
-                $user->setArchived(true);
-                $word = "disabled";
-            }
-
-            $em->persist($user);
-            $em->flush();
-
-            $this->addFlash("success-flash", "The user " . $user->getFirstname() . " " . $user->getLastname() .
-                " was " . $word . " sucessfuly");
-        }
-
-        return $this->redirectToRoute("ribsadmin_accounts");
-    }
+				/**
+				 * @Route("/accounts/", name="ribsadmin_accounts")
+				 * @return Response
+				 */
+				public function list(): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$current_account = $this->getUser()->getUser();
+
+								$users = $em->getRepository("RibsAdminBundle:Account")->findAllUserArchived($current_account);
+								$users_archived = $em->getRepository("RibsAdminBundle:Account")->findAllUserArchived($current_account, true);
+
+								return $this->render('@RibsAdmin/accounts/list.html.twig', [
+												"users" => $users,
+												"users_archived" => $users_archived
+								]);
+				}
+
+				/**
+				 * @Route("/accounts/create/", name="ribsadmin_accounts_create")
+				 * @Route("/accounts/show/{guid}", name="ribsadmin_accounts_show")
+				 * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
+				 * @param Request $request
+				 * @param string|null $guid
+				 * @return Response
+				 */
+				public function edit(Request $request, string $guid = null): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$disabled_form = strpos($request->get("_route"), "_show") ? true : false;
+
+								if ($guid === null) {
+												$account = new Account();
+												$old_password = null;
+												$user = null;
+								} else {
+												$user = $em->getRepository(User::class)->findOneBy(["guid" => $guid]);
+												$account = $em->getRepository(Account::class)->findOneBy(["user" => $user->getId()]);
+												$old_password = $account->getPassword();
+								}
+
+								$form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account,  ["disabled" => $disabled_form]);
+
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												/**
+												 * @var Account
+												 */
+												$data = $form->getData();
+
+												$account_exist = $em->getRepository(Account::class)->findOneBy(["username" => $data->getUsername()]);
+
+												if ($account_exist && $account_exist === $account) {
+																$account_exist = null;
+												}
+
+												if (!$account_exist) {
+																if ($guid === null) {
+																				$temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
+																				$data->setPassword($temp_password);
+																} else if ($form->get("password")->getData()) {
+																				$temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
+																				$data->setPassword($temp_password);
+																} else {
+																				$data->setPassword($old_password);
+																}
+
+																$em->persist($data);
+																$em->flush();
+
+																$username = $data->getUser()->getFirstName() . " " . $data->getUser()->getLastName();
+
+																if ($guid === null) {
+																				$this->addFlash("success-flash", "the account of " . $username . " was created");
+																} else {
+																				$this->addFlash("success-flash", "the account of " . $username . " was edited");
+																}
+
+																return $this->redirectToRoute("ribsadmin_accounts");
+												} else {
+																$this->addFlash("error-flash", "An account with username " . $data->getUsername() . " already exist");
+																return $this->redirectToRoute($request->get("_route"), ["guid" => $guid]);
+												}
+								}
+
+								return $this->render("@RibsAdmin/accounts/edit.html.twig", [
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"user" => $user,
+												"disabled_form" => $disabled_form
+								]);
+				}
+
+				/**
+				 * method to disable or enable a user
+				 * @Route("/accounts/archive/{guid}/{activate}", name="ribsadmin_accounts_archive")
+				 * @param string $guid
+				 * @param bool $activate
+				 * @return RedirectResponse
+				 */
+				public function archive(string $guid, bool $activate = false): RedirectResponse
+				{
+								$em = $this->getDoctrine()->getManager();
+
+								$user = $em->getRepository("RibsAdminBundle:User")->findOneBy(["guid" => $guid]);
+
+								if ($user) {
+												if ($activate === true) {
+																$user->setArchived(false);
+																$word = "activated";
+												} else {
+																$user->setArchived(true);
+																$word = "disabled";
+												}
+
+												$em->persist($user);
+												$em->flush();
+
+												$this->addFlash("success-flash", "The user " . $user->getFirstname() . " " . $user->getLastname() .
+																" was " . $word . " sucessfuly");
+								}
+
+								return $this->redirectToRoute("ribsadmin_accounts");
+				}
 }

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $old_password = $account->getPassword();
         }
 
-        $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account,  ["disabled" => $disabled_form]);
+        $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account, ["disabled" => $disabled_form]);
 
         $form->handleRequest($request);
 

Repository/NavigationRepository.php

Indentation +22 added lines, -22 removed lines

@@ -7,38 +7,38 @@
 
 class NavigationRepository extends EntityRepository
 {
-    /**
-     * function that return all navigation links of pages and modules
-     * @return array
-     * @throws DBALException
-     */
-    public function findAllNavigation(): array
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
+				/**
+				 * function that return all navigation links of pages and modules
+				 * @return array
+				 * @throws DBALException
+				 */
+				public function findAllNavigation(): array
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
 			LEFT JOIN page p ON n.id_page = p.id AND p.displayed = 1
 			LEFT JOIN module m ON n.id_module = m.id AND m.displayed = 1
 		  	ORDER BY n.order ASC
  		");
 
-        $query->execute();
+								$query->execute();
 
-        return $query->fetchAll(\PDO::FETCH_ASSOC);
-    }
+								return $query->fetchAll(\PDO::FETCH_ASSOC);
+				}
 
-    /**
-     * function that return all navigation links of pages
-     * @return array
-     * @throws DBALException
-     */
-    public function findAllNavigationPage(): array
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("SELECT p.id, p.url, p.title, p.title_tag FROM navigation n
+				/**
+				 * function that return all navigation links of pages
+				 * @return array
+				 * @throws DBALException
+				 */
+				public function findAllNavigationPage(): array
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("SELECT p.id, p.url, p.title, p.title_tag FROM navigation n
 			INNER JOIN page p ON n.id_page = p.id AND p.displayed = 1
 		  	ORDER BY n.order ASC
  		");
 
-        $query->execute();
+								$query->execute();
 
-        return $query->fetchAll(\PDO::FETCH_ASSOC);
-    }
+								return $query->fetchAll(\PDO::FETCH_ASSOC);
+				}
 }

Controller/PageController.php

Indentation +21 added lines, -21 removed lines

@@ -8,28 +8,28 @@
 
 class PageController extends AbstractController
 {
-    /**
-     * @Route("/contents", name="ribsadmin_contents")
-     * @return Response
-     */
-    public function index(): Response
-    {
-        $navigation = $this->getDoctrine()->getManager()->getRepository("RibsAdminBundle:Navigation")->findAllNavigationPage();
+				/**
+				 * @Route("/contents", name="ribsadmin_contents")
+				 * @return Response
+				 */
+				public function index(): Response
+				{
+								$navigation = $this->getDoctrine()->getManager()->getRepository("RibsAdminBundle:Navigation")->findAllNavigationPage();
 
-        return $this->render('@RibsAdmin/page/index.html.twig', ["navigation" => $navigation]);
-    }
+								return $this->render('@RibsAdmin/page/index.html.twig', ["navigation" => $navigation]);
+				}
 
-    /**
-     * @Route("/contents/edit-page/{page_id}", name="ribsadmin_contents_edit_page")
-     * @param int $page_id
-     * @return Response
-     */
-    public function editPage(int $page_id): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $navigation = $em->getRepository("RibsAdminBundle:Navigation")->findAllNavigationPage();
-        $page = $em->getRepository("RibsAdminBundle:Page")->find($page_id);
+				/**
+				 * @Route("/contents/edit-page/{page_id}", name="ribsadmin_contents_edit_page")
+				 * @param int $page_id
+				 * @return Response
+				 */
+				public function editPage(int $page_id): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$navigation = $em->getRepository("RibsAdminBundle:Navigation")->findAllNavigationPage();
+								$page = $em->getRepository("RibsAdminBundle:Page")->find($page_id);
 
-        return $this->render('@RibsAdmin/page/edit-page.html.twig', ["navigation" => $navigation, "page" => $page]);
-    }
+								return $this->render('@RibsAdmin/page/edit-page.html.twig', ["navigation" => $navigation, "page" => $page]);
+				}
 }

Service/AccessRights.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		
 		$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json"));
 		$modules_rights = $this->module->getModuleRights();
-		$ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights);
+		$ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights);
 
         if ($this->testIsOpenUrl($route)) {
             return;

Indentation +46 added lines, -46 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()
@@ -98,9 +98,9 @@ 
 		$modules_rights = $this->module->getModuleRights();
 		$ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights);
 
-        if ($this->testIsOpenUrl($route)) {
-            return;
-        }
+								if ($this->testIsOpenUrl($route)) {
+												return;
+								}
 
 		if ($admin_page == "ribsadmin" && !$api && strpos($route, "login") === false && strpos($route, "register") === false) {
 			//redirection if user not connected
@@ -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
@@ -201,11 +201,11 @@ 
 		$it = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($haystack));
 		
 		foreach ($it AS $element => $value) {
-		    if (strpos($value, ", ") !== false) {
-		        if (in_array($needle, $explode = explode(", ", $value))) {
-                    $value = $needle;
-                }
-            }
+						if (strpos($value, ", ") !== false) {
+										if (in_array($needle, $explode = explode(", ", $value))) {
+																				$value = $needle;
+																}
+												}
 
 			if ($value == $needle) {
 				$rights[] = $it->getInnerIterator()["right"];
@@ -220,7 +220,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
@@ -235,7 +235,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

Form/Package.php

Indentation +29 added lines, -29 removed lines

@@ -11,10 +11,10 @@ 
 
 class Package extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+				/**
+				 * @param FormBuilderInterface $builder
+				 * @param array $options
+				 */
 	public function buildForm(FormBuilderInterface $builder, array $options)
 	{
 		$builder
@@ -25,33 +25,33 @@ 
 				"label" => "Project url",
 				"required" => true
 			])
-            ->add("packageName", TextType::class, [
-                "label" => "Package name"
-            ])
-            ->add("checkVersionUrl", TextType::class, [
-                "label" => "Check version url",
-                "required" => false
-            ])
-            ->add("composerLockUrl", TextType::class, [
-                "label" => "Check composer.lock url",
-                "required" => false
-            ])
-            ->add('isLocal', CheckboxType::class, [
-                'label' => 'Is local project',
-                'attr' => [
-                    'class' => 'ribs-checkbox switched'
-                ],
-                'required' => false
-            ])
-            ->add('submit', SubmitType::class, [
-                'label' => 'Validate',
-                'attr' => []
-            ]);
+												->add("packageName", TextType::class, [
+																"label" => "Package name"
+												])
+												->add("checkVersionUrl", TextType::class, [
+																"label" => "Check version url",
+																"required" => false
+												])
+												->add("composerLockUrl", TextType::class, [
+																"label" => "Check composer.lock url",
+																"required" => false
+												])
+												->add('isLocal', CheckboxType::class, [
+																'label' => 'Is local project',
+																'attr' => [
+																				'class' => 'ribs-checkbox switched'
+																],
+																'required' => false
+												])
+												->add('submit', SubmitType::class, [
+																'label' => 'Validate',
+																'attr' => []
+												]);
 	}
 
-    /**
-     * @param OptionsResolver $resolver
-     */
+				/**
+				 * @param OptionsResolver $resolver
+				 */
 	public function configureOptions(OptionsResolver $resolver)
 	{
 		$resolver->setDefaults([

Entity/Package.php

Indentation +315 added lines, -315 removed lines

@@ -15,326 +15,326 @@
  */
 class Package
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="project_name", type="string", length=255, nullable=false)
-     */
-    private $project_name;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="package_name", type="string", length=255, nullable=false)
-     */
-    private $package_name;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="project_url", type="string", length=255, nullable=false)
-     */
-    private $project_url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="version", type="string", length=255, nullable=true)
-     */
-    private $version;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="last_packagist_version", type="string", length=255, nullable=true)
-     */
-    private $last_packagist_version;
-
-    /**
-     * @var DateTime
-     *
-     * @ORM\Column(name="version_date", type="date", nullable=true)
-     */
-    private $version_date;
-
-    /**
-     * @var DateTime
-     *
-     * @ORM\Column(name="last_check", type="datetime", nullable=true)
-     */
-    private $last_check;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="mode", type="string", length=255, nullable=true)
-     */
-    private $mode;
+				use GuidTrait;
+				use CreatedUpdatedTrait;
+
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
+				 */
+				private $id;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="project_name", type="string", length=255, nullable=false)
+				 */
+				private $project_name;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="package_name", type="string", length=255, nullable=false)
+				 */
+				private $package_name;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="project_url", type="string", length=255, nullable=false)
+				 */
+				private $project_url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="version", type="string", length=255, nullable=true)
+				 */
+				private $version;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="last_packagist_version", type="string", length=255, nullable=true)
+				 */
+				private $last_packagist_version;
+
+				/**
+				 * @var DateTime
+				 *
+				 * @ORM\Column(name="version_date", type="date", nullable=true)
+				 */
+				private $version_date;
+
+				/**
+				 * @var DateTime
+				 *
+				 * @ORM\Column(name="last_check", type="datetime", nullable=true)
+				 */
+				private $last_check;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="mode", type="string", length=255, nullable=true)
+				 */
+				private $mode;
 	
 	/**
 	 * @var string
 	 *
 	 * @ORM\Column(name="check_version_url", type="string", length=255, nullable=true)
 	 */
-    private $check_version_url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="composer_lock_url", type="string", length=255, nullable=true)
-     */
-    private $composer_lock_url;
-
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="is_local", type="boolean", nullable=false, options={"default": false}))
-     */
-    private $is_local;
-
-    /**
-     * @return int
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     * @return Package
-     */
-    public function setId(int $id): self
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectName(): ?string
-    {
-        return $this->project_name;
-    }
-
-    /**
-     * @param string $project_name
-     * @return Package
-     */
-    public function setProjectName(string $project_name): self
-    {
-        $this->project_name = $project_name;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPackageName(): ?string
-    {
-        return $this->package_name;
-    }
-
-    /**
-     * @param string $package_name
-     * @return Package
-     */
-    public function setPackageName(string $package_name): self
-    {
-        $this->package_name = $package_name;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectUrl(): ?string
-    {
-        return $this->project_url;
-    }
-
-    /**
-     * @param string $project_url
-     * @return Package
-     */
-    public function setProjectUrl(string $project_url): self
-    {
-        $this->project_url = $project_url;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion(): ?string
-    {
-        return $this->version;
-    }
-
-    /**
-     * @param string $version
-     * @return Package
-     */
-    public function setVersion(?string $version): self
-    {
-        $this->version = $version;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLastPackagistVersion(): ?string
-    {
-        return $this->last_packagist_version;
-    }
-
-    /**
-     * @param string $last_packagist_version
-     * @return Package
-     */
-    public function setLastPackagistVersion(?string $last_packagist_version): self
-    {
-        $this->last_packagist_version = $last_packagist_version;
-
-        return $this;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getVersionDate(): ?DateTime
-    {
-        return $this->version_date;
-    }
-
-    /**
-     * @param DateTime $version_date
-     * @return Package
-     */
-    public function setVersionDate(?DateTime $version_date): self
-    {
-        $this->version_date = $version_date;
-
-        return $this;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getLastCheck(): ?DateTime
-    {
-        return $this->last_check;
-    }
-
-    /**
-     * @param DateTime $last_check
-     * @return Package
-     */
-    public function setLastCheck(DateTime $last_check): self
-    {
-        $this->last_check = $last_check;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMode(): ?string
-    {
-        return $this->mode;
-    }
-
-    /**
-     * @param string $mode
-     * @return Package
-     */
-    public function setMode(string $mode): self
-    {
-        $this->mode = $mode;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCheckVersionUrl(): ?string
-    {
-        return $this->check_version_url;
-    }
-
-    /**
-     * @param string|null $check_version_url
-     * @return Package
-     */
-    public function setCheckVersionUrl(?string $check_version_url): self
-    {
-        $this->check_version_url = $check_version_url;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getComposerLockUrl(): ?string
-    {
-        return $this->composer_lock_url;
-    }
-
-    /**
-     * @param string|null $composer_lock_url
-     * @return Package
-     */
-    public function setComposerLockUrl(?string $composer_lock_url): self
-    {
-        $this->composer_lock_url = $composer_lock_url;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isIsLocal(): ?bool
-    {
-        return $this->is_local;
-    }
-
-    /**
-     * @param bool $is_local
-     * @return Package
-     */
-    public function setIsLocal(bool $is_local): self
-    {
-        $this->is_local = $is_local;
-
-        return $this;
-    }
-
-    public function getFormattedIsLocal()
-    {
-        return $this->isIsLocal() ? "Yes" : "No";
-    }
+				private $check_version_url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="composer_lock_url", type="string", length=255, nullable=true)
+				 */
+				private $composer_lock_url;
+
+				/**
+				 * @var boolean
+				 *
+				 * @ORM\Column(name="is_local", type="boolean", nullable=false, options={"default": false}))
+				 */
+				private $is_local;
+
+				/**
+				 * @return int
+				 */
+				public function getId(): int
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 * @return Package
+				 */
+				public function setId(int $id): self
+				{
+								$this->id = $id;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getProjectName(): ?string
+				{
+								return $this->project_name;
+				}
+
+				/**
+				 * @param string $project_name
+				 * @return Package
+				 */
+				public function setProjectName(string $project_name): self
+				{
+								$this->project_name = $project_name;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getPackageName(): ?string
+				{
+								return $this->package_name;
+				}
+
+				/**
+				 * @param string $package_name
+				 * @return Package
+				 */
+				public function setPackageName(string $package_name): self
+				{
+								$this->package_name = $package_name;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getProjectUrl(): ?string
+				{
+								return $this->project_url;
+				}
+
+				/**
+				 * @param string $project_url
+				 * @return Package
+				 */
+				public function setProjectUrl(string $project_url): self
+				{
+								$this->project_url = $project_url;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getVersion(): ?string
+				{
+								return $this->version;
+				}
+
+				/**
+				 * @param string $version
+				 * @return Package
+				 */
+				public function setVersion(?string $version): self
+				{
+								$this->version = $version;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getLastPackagistVersion(): ?string
+				{
+								return $this->last_packagist_version;
+				}
+
+				/**
+				 * @param string $last_packagist_version
+				 * @return Package
+				 */
+				public function setLastPackagistVersion(?string $last_packagist_version): self
+				{
+								$this->last_packagist_version = $last_packagist_version;
+
+								return $this;
+				}
+
+				/**
+				 * @return DateTime
+				 */
+				public function getVersionDate(): ?DateTime
+				{
+								return $this->version_date;
+				}
+
+				/**
+				 * @param DateTime $version_date
+				 * @return Package
+				 */
+				public function setVersionDate(?DateTime $version_date): self
+				{
+								$this->version_date = $version_date;
+
+								return $this;
+				}
+
+				/**
+				 * @return DateTime
+				 */
+				public function getLastCheck(): ?DateTime
+				{
+								return $this->last_check;
+				}
+
+				/**
+				 * @param DateTime $last_check
+				 * @return Package
+				 */
+				public function setLastCheck(DateTime $last_check): self
+				{
+								$this->last_check = $last_check;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getMode(): ?string
+				{
+								return $this->mode;
+				}
+
+				/**
+				 * @param string $mode
+				 * @return Package
+				 */
+				public function setMode(string $mode): self
+				{
+								$this->mode = $mode;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getCheckVersionUrl(): ?string
+				{
+								return $this->check_version_url;
+				}
+
+				/**
+				 * @param string|null $check_version_url
+				 * @return Package
+				 */
+				public function setCheckVersionUrl(?string $check_version_url): self
+				{
+								$this->check_version_url = $check_version_url;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getComposerLockUrl(): ?string
+				{
+								return $this->composer_lock_url;
+				}
+
+				/**
+				 * @param string|null $composer_lock_url
+				 * @return Package
+				 */
+				public function setComposerLockUrl(?string $composer_lock_url): self
+				{
+								$this->composer_lock_url = $composer_lock_url;
+
+								return $this;
+				}
+
+				/**
+				 * @return bool
+				 */
+				public function isIsLocal(): ?bool
+				{
+								return $this->is_local;
+				}
+
+				/**
+				 * @param bool $is_local
+				 * @return Package
+				 */
+				public function setIsLocal(bool $is_local): self
+				{
+								$this->is_local = $is_local;
+
+								return $this;
+				}
+
+				public function getFormattedIsLocal()
+				{
+								return $this->isIsLocal() ? "Yes" : "No";
+				}
 }
 

Controller/PackageController.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
                 $message = "<ul>";
                 $message .= "<li>The project package was not well updated</li>";
                 foreach ($version->getMessages() as $version_message) {
-                    $message .= "<li>".$version_message."</li>";
+                    $message .= "<li>" . $version_message . "</li>";
                 }
                 $message .= "</ul>";
 

Indentation +123 added lines, -123 removed lines

@@ -19,128 +19,128 @@
 
 class PackageController extends AbstractController
 {
-    /**
-     * @Route("/packages/", name="ribsadmin_packages")
-     * @param EntityManagerInterface $em
-     * @return Response
-     */
-    public function index(EntityManagerInterface $em): Response
-    {
-        $packages = $em->getRepository(Package::class)->findAll();
+				/**
+				 * @Route("/packages/", name="ribsadmin_packages")
+				 * @param EntityManagerInterface $em
+				 * @return Response
+				 */
+				public function index(EntityManagerInterface $em): Response
+				{
+								$packages = $em->getRepository(Package::class)->findAll();
         
-        return $this->render("@RibsAdmin/packages/list.html.twig", ["packages" => $packages]);
-    }
-
-    /**
-     * @Route("/packages/create/", name="ribsadmin_packages_create")
-     * @Route("/packages/show/{guid}", name="ribsadmin_packages_show")
-     * @Route("/packages/edit/{guid}", name="ribsadmin_packages_edit")
-     * @param Request $request
-     * @param EntityManagerInterface $em
-     * @param PackagistApi $packagist
-     * @param string|null $guid
-     * @return Response
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
-     */
-    public function edit(Request $request, EntityManagerInterface $em, PackagistApi $packagist, string $guid = null): Response
-    {
-        $disabled_form = strpos($request->get("_route"), "_show") ? true : false;
-        if (!$guid) {
-            $package = new Package();
-            $text = "created";
-        } else {
-            $package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
-            $text = "edited";
-        }
-
-        $form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Package::class, $package, ["disabled" => $disabled_form]);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var Package $data */
-            $data = $form->getData();
-            $em->persist($data);
-            $em->flush();
-            $this->addFlash("success-flash", "Package " . $data->getProjectName() . " was " . $text);
-
-            return $this->redirectToRoute("ribsadmin_packages");
-        }
-
-        return $this->render("@RibsAdmin/packages/edit.html.twig", [
-            "disabled_form" => $disabled_form,
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "package" => $package,
-            "versions" => $packagist->getAllPackagistVersions($package->getPackageName())
-        ]);
-    }
-
-    /**
-     * @Route("/packages/delete/{guid}", name="ribsadmin_packages_delete")
-     * @param EntityManagerInterface $em
-     * @param string $guid
-     * @return RedirectResponse
-     */
-    public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
-    {
-        $package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
-
-        if ($package) {
-            $em->remove($package);
-            $em->flush();
-            $this->addFlash("success-flash", "The project package was deleted");
-        } else {
-            $this->addFlash("error-flash", "The project package was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_packages");
-    }
-
-    /**
-     * @Route("/packages/update/{guid}", name="ribsadmin_packages_update")
-     * @param Version $version
-     * @param string $guid
-     * @return RedirectResponse
-     * @throws Exception
-     */
-    public function updatePackage(Version $version, string $guid): RedirectResponse
-    {
-        if ($guid) {
-            $version->save($guid);
-
-            if ($version->getMessages()) {
-                $message = "<ul>";
-                $message .= "<li>The project package was not well updated</li>";
-                foreach ($version->getMessages() as $version_message) {
-                    $message .= "<li>".$version_message."</li>";
-                }
-                $message .= "</ul>";
-
-                $this->addFlash("info-flash", $message);
-            } else {
-                $this->addFlash("success-flash", "The project package was updated");
-            }
-        } else {
-            $this->addFlash("error-flash", "The project package was not found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_packages");
-    }
-
-    /**
-     * @Route("/packages/update-version/{guid}/{install_version}", name="ribsadmin_packages_update_version")
-     * @param Version $version
-     * @param string $guid
-     * @param string $install_version
-     * @return RedirectResponse
-     */
-    public function changePackageVersion(Version $version, string $guid, string $install_version): RedirectResponse
-    {
-        $version->updatePackage($guid, $install_version);
-
-        return $this->redirectToRoute("ribsadmin_packages_update", ["guid" => $guid]);
-    }
+								return $this->render("@RibsAdmin/packages/list.html.twig", ["packages" => $packages]);
+				}
+
+				/**
+				 * @Route("/packages/create/", name="ribsadmin_packages_create")
+				 * @Route("/packages/show/{guid}", name="ribsadmin_packages_show")
+				 * @Route("/packages/edit/{guid}", name="ribsadmin_packages_edit")
+				 * @param Request $request
+				 * @param EntityManagerInterface $em
+				 * @param PackagistApi $packagist
+				 * @param string|null $guid
+				 * @return Response
+				 * @throws ClientExceptionInterface
+				 * @throws RedirectionExceptionInterface
+				 * @throws ServerExceptionInterface
+				 * @throws TransportExceptionInterface
+				 */
+				public function edit(Request $request, EntityManagerInterface $em, PackagistApi $packagist, string $guid = null): Response
+				{
+								$disabled_form = strpos($request->get("_route"), "_show") ? true : false;
+								if (!$guid) {
+												$package = new Package();
+												$text = "created";
+								} else {
+												$package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
+												$text = "edited";
+								}
+
+								$form = $this->createForm(\PiouPiou\RibsAdminBundle\Form\Package::class, $package, ["disabled" => $disabled_form]);
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												/** @var Package $data */
+												$data = $form->getData();
+												$em->persist($data);
+												$em->flush();
+												$this->addFlash("success-flash", "Package " . $data->getProjectName() . " was " . $text);
+
+												return $this->redirectToRoute("ribsadmin_packages");
+								}
+
+								return $this->render("@RibsAdmin/packages/edit.html.twig", [
+												"disabled_form" => $disabled_form,
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"package" => $package,
+												"versions" => $packagist->getAllPackagistVersions($package->getPackageName())
+								]);
+				}
+
+				/**
+				 * @Route("/packages/delete/{guid}", name="ribsadmin_packages_delete")
+				 * @param EntityManagerInterface $em
+				 * @param string $guid
+				 * @return RedirectResponse
+				 */
+				public function delete(EntityManagerInterface $em, string $guid): RedirectResponse
+				{
+								$package = $em->getRepository(Package::class)->findOneBy(["guid" => $guid]);
+
+								if ($package) {
+												$em->remove($package);
+												$em->flush();
+												$this->addFlash("success-flash", "The project package was deleted");
+								} else {
+												$this->addFlash("error-flash", "The project package was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_packages");
+				}
+
+				/**
+				 * @Route("/packages/update/{guid}", name="ribsadmin_packages_update")
+				 * @param Version $version
+				 * @param string $guid
+				 * @return RedirectResponse
+				 * @throws Exception
+				 */
+				public function updatePackage(Version $version, string $guid): RedirectResponse
+				{
+								if ($guid) {
+												$version->save($guid);
+
+												if ($version->getMessages()) {
+																$message = "<ul>";
+																$message .= "<li>The project package was not well updated</li>";
+																foreach ($version->getMessages() as $version_message) {
+																				$message .= "<li>".$version_message."</li>";
+																}
+																$message .= "</ul>";
+
+																$this->addFlash("info-flash", $message);
+												} else {
+																$this->addFlash("success-flash", "The project package was updated");
+												}
+								} else {
+												$this->addFlash("error-flash", "The project package was not found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_packages");
+				}
+
+				/**
+				 * @Route("/packages/update-version/{guid}/{install_version}", name="ribsadmin_packages_update_version")
+				 * @param Version $version
+				 * @param string $guid
+				 * @param string $install_version
+				 * @return RedirectResponse
+				 */
+				public function changePackageVersion(Version $version, string $guid, string $install_version): RedirectResponse
+				{
+								$version->updatePackage($guid, $install_version);
+
+								return $this->redirectToRoute("ribsadmin_packages_update", ["guid" => $guid]);
+				}
 }

Command/UpdatePackagesInfo.php

Indentation +43 added lines, -43 removed lines

@@ -12,47 +12,47 @@
 
 class UpdatePackagesInfo extends Command
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var Version
-     */
-    private $version;
-
-    /**
-     * ImportModuleCommand constructor.
-     * @param EntityManagerInterface $em
-     * @param Version $version
-     * @param string|null $name
-     */
-    public function __construct(EntityManagerInterface $em, Version $version, string $name = null)
-    {
-        parent::__construct($name);
-        $this->em = $em;
-        $this->version = $version;
-    }
-
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:update-packages-info')
-            ->setDescription('Update all packages versions informatio')
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $packages = $this->em->getRepository(Package::class)->findAll();
-
-        /** @var Package $package */
-        foreach ($packages as $package) {
-            $output->writeln("Update ".$package->getPackageName()." info");
-            $this->version->save($package->getGuid());
-        }
-
-        return 0;
-    }
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * @var Version
+				 */
+				private $version;
+
+				/**
+				 * ImportModuleCommand constructor.
+				 * @param EntityManagerInterface $em
+				 * @param Version $version
+				 * @param string|null $name
+				 */
+				public function __construct(EntityManagerInterface $em, Version $version, string $name = null)
+				{
+								parent::__construct($name);
+								$this->em = $em;
+								$this->version = $version;
+				}
+
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:update-packages-info')
+												->setDescription('Update all packages versions informatio')
+								;
+				}
+
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$packages = $this->em->getRepository(Package::class)->findAll();
+
+								/** @var Package $package */
+								foreach ($packages as $package) {
+												$output->writeln("Update ".$package->getPackageName()." info");
+												$this->version->save($package->getGuid());
+								}
+
+								return 0;
+				}
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         /** @var Package $package */
         foreach ($packages as $package) {
-            $output->writeln("Update ".$package->getPackageName()." info");
+            $output->writeln("Update " . $package->getPackageName() . " info");
             $this->version->save($package->getGuid());
         }