Piou-piou / RibsAdminBundle

EventListener/GuidAwareListener.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public function prePersist($entity)
 	{
 		if ($entity->getGuid() === null) {
-			$entity->setGuid((string)Uuid::uuid4());
+			$entity->setGuid((string) Uuid::uuid4());
 		}
 	}
 }

Indentation +5 added lines, -5 removed lines

@@ -12,11 +12,11 @@
 	 */
 	private $container;
 
-    /**
-     * GuidAwareListener constructor.
-     * @param ContainerInterface $container
-     */
-    public function __construct(ContainerInterface $container)
+				/**
+				 * GuidAwareListener constructor.
+				 * @param ContainerInterface $container
+				 */
+				public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}

Controller/AccountsController.php

Spacing +3 added lines, -3 removed lines

@@ -75,14 +75,14 @@
 				$username = $data->getUser()->getFirstName() . " " . $data->getUser()->getLastName();
 				
 				if ($guid === null) {
-					$this->addFlash("success-flash", "the account of ". $username . " was created");
+					$this->addFlash("success-flash", "the account of " . $username . " was created");
 				} else {
-					$this->addFlash("success-flash", "the account of ". $username . " was edited");
+					$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");
+				$this->addFlash("error-flash", "An account with username " . $data->getUsername() . " already exist");
 				return $this->redirectToRoute($request->get("_route"), ["guid" => $guid]);
 			}
 		}

Indentation +20 added lines, -20 removed lines

@@ -33,13 +33,13 @@ 
 		]);
 	}
 
-    /**
-     * @Route("/accounts/create/", name="ribsadmin_accounts_create")
-     * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
-     * @param Request $request
-     * @param string|null $guid
-     * @return Response
-     */
+				/**
+				 * @Route("/accounts/create/", name="ribsadmin_accounts_create")
+				 * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
+				 * @param Request $request
+				 * @param string|null $guid
+				 * @return Response
+				 */
 	public function editUserAction(Request $request, string $guid = null): Response
 	{
 		$em = $this->getDoctrine()->getManager();
@@ -47,11 +47,11 @@ 
 		if ($guid === null) {
 			$account = new Account();
 			$old_password = null;
-            $user = 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();
+												$old_password = $account->getPassword();
 		}
 		
 		$form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account);
@@ -71,15 +71,15 @@ 
 			}
 			
 			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);
-                }
+							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();
@@ -101,8 +101,8 @@ 
 		
 		return $this->render("@RibsAdmin/accounts/edit.html.twig", [
 			"form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "user" => $user
+												"form_errors" => $form->getErrors(),
+												"user" => $user
 		]);
 	}
 	//-------------------------------------------- END DISPLAY VIEWS -----------------------------------------------------------//

Service/ModuleService.php

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	}
 	
 	/**
-     * method that return all infos needed in access right management page
+	 * method that return all infos needed in access right management page
 	 * @return array
 	 */
 	public function getAllInfosModules()
@@ -44,7 +44,7 @@ 
 	}
 	
 	/**
-     * function that return all modules rights
+	 * function that return all modules rights
 	 * @return object
 	 */
 	public function getModuleRights()

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 		foreach ($modules as $module) {
 			$modules_data[] = [
 				"name" => $module->getTitle(),
-				"rights" => (array)json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
+				"rights" => (array) json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
 			];
 		}
 		
@@ -59,6 +59,6 @@ 
 			$rights[] = json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"));
 		}
 		
-		return (object)$rights;
+		return (object) $rights;
 	}
 }

Service/AccessRights.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,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 ($admin_page == "ribsadmin" && $api !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) {
 			//redirection if user not connected

Indentation +31 added lines, -31 removed lines

@@ -42,10 +42,10 @@ 
 	 */
 	private $module;
 
-    /**
-     * @var Api
-     */
-    private $api;
+				/**
+				 * @var Api
+				 */
+				private $api;
 	
 	/**
 	 * @var User
@@ -55,17 +55,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;
@@ -77,8 +77,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()
@@ -119,14 +119,14 @@ 
 			
 			throw new AccessDeniedException("No access");
 		} else if ($api === "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");
+												}
+								}
 	}
 	
 	/**
-     * 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
 	 */
@@ -137,9 +137,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;
@@ -149,7 +149,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
 	 */
@@ -161,8 +161,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)) {
@@ -174,7 +174,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
@@ -198,7 +198,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
@@ -213,7 +213,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

Service/Jwt.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 class Jwt
 {
 	/**
-     * encode an array in jwt
+	 * encode an array in jwt
 	 * @param array $values
 	 * @param string $token
 	 * @return string
@@ -18,7 +18,7 @@ 
 	}
 	
 	/**
-     * encode a jwt in array
+	 * encode a jwt in array
 	 * @param string $encoded_json
 	 * @param string $token
 	 * @return bool|object

Command/ImportModuleCommand.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $output->writeln("Start composer require " . $pacakge_name);
 
         $process = new Process("composer require " . $pacakge_name);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

Indentation +51 added lines, -51 removed lines

@@ -13,64 +13,64 @@
 
 class ImportModuleCommand extends Command
 {
-    private $em;
+				private $em;
 
-    /**
-     * ImportModuleCommand constructor.
-     * @param EntityManagerInterface $em
-     * @param string|null $name
-     */
-    public function __construct(EntityManagerInterface $em, string $name = null)
-    {
-        parent::__construct($name);
-        $this->em = $em;
-    }
+				/**
+				 * ImportModuleCommand constructor.
+				 * @param EntityManagerInterface $em
+				 * @param string|null $name
+				 */
+				public function __construct(EntityManagerInterface $em, string $name = null)
+				{
+								parent::__construct($name);
+								$this->em = $em;
+				}
 
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:import-module')
-            ->setDescription('Import a module in ribs admin')
-            ->addArgument(
-                'package-name',
-                InputArgument::REQUIRED,
-                'Name of composer package to import'
-            )
-            ->addArgument(
-                'module-name',
-                InputArgument::REQUIRED,
-                'Name of package to display in app'
-            )
-        ;
-    }
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:import-module')
+												->setDescription('Import a module in ribs admin')
+												->addArgument(
+																'package-name',
+																InputArgument::REQUIRED,
+																'Name of composer package to import'
+												)
+												->addArgument(
+																'module-name',
+																InputArgument::REQUIRED,
+																'Name of package to display in app'
+												)
+								;
+				}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $pacakge_name = $input->getArgument('package-name');
-        $output->writeln("Start composer require " . $pacakge_name);
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$pacakge_name = $input->getArgument('package-name');
+								$output->writeln("Start composer require " . $pacakge_name);
 
-        $process = new Process("composer require " . $pacakge_name);
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
+								$process = new Process("composer require " . $pacakge_name);
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
 
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
+								if (!$process->isSuccessful()) {
+												throw new ProcessFailedException($process);
+								}
 
-        $output->writeln("End composer require " . $pacakge_name);
-        $output->writeln("Start insertion of module in database " . $pacakge_name);
+								$output->writeln("End composer require " . $pacakge_name);
+								$output->writeln("Start insertion of module in database " . $pacakge_name);
 
-        $module = new Module();
-        $module->setPackageName($pacakge_name);
-        $module->setTitle($input->getArgument('module-name'));
-        $module->setActive(false);
-        $module->setDisplayed(true);
-        $this->em->persist($module);
-        $this->em->flush();
+								$module = new Module();
+								$module->setPackageName($pacakge_name);
+								$module->setTitle($input->getArgument('module-name'));
+								$module->setActive(false);
+								$module->setDisplayed(true);
+								$this->em->persist($module);
+								$this->em->flush();
 
-        $output->writeln("Installation of " . $pacakge_name . " is finished. You have now to configure this module in your administration interface");
+								$output->writeln("Installation of " . $pacakge_name . " is finished. You have now to configure this module in your administration interface");
 
-        return 0;
-    }
+								return 0;
+				}
 }

Controller/PageController.php

Indentation +5 added lines, -5 removed lines

@@ -8,11 +8,11 @@
 
 class PageController extends AbstractController
 {
-    /**
-     * method to show index page of content management
-     * @Route("/contents", name="ribsadmin_contents")
-     * @return Response
-     */
+				/**
+				 * method to show index page of content management
+				 * @Route("/contents", name="ribsadmin_contents")
+				 * @return Response
+				 */
 	public function indexAction(): Response
 	{
 		$navigation = $this->getDoctrine()->getManager()->getRepository("RibsAdminBundle:Navigation")->findAllNavigationPage();

Controller/RenderPageController.php

Indentation +5 added lines, -5 removed lines

@@ -9,11 +9,11 @@
 
 class RenderPageController extends AbstractController
 {
-    /**
-     * @Route("/page/{url}", name="page", requirements={"url" = "[a-zA-Z0-9\-\_\/]*"})
-     * @param string $url
-     * @return Response
-     */
+				/**
+				 * @Route("/page/{url}", name="page", requirements={"url" = "[a-zA-Z0-9\-\_\/]*"})
+				 * @param string $url
+				 * @return Response
+				 */
 	public function renderPageAction(string $url): Response
 	{
 		$em = $this->getDoctrine()->getManager();

Controller/NavigationBuilderController.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	private  $nav = [];
 	
 	/**
-     * function that display the left navigation mapped by user rights
+	 * function that display the left navigation mapped by user rights
 	 * @return Response
 	 */
 	public function getLeftNavigation(Globals $globals, AccessRights $access_rights): Response

Spacing +1 added lines, -2 removed lines

@@ -42,8 +42,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 ($this->get("ribs_admin.acess_rights")->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {