Piou-piou / RibsAdminBundle

Service/Api.php

Indentation +188 added lines, -188 removed lines

@@ -23,192 +23,192 @@
 
 class Api
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var SessionInterface
-     */
-    private $session;
-
-    /**
-     * @var Account
-     */
-    private $account;
-
-    /**
-     * @var Request|null
-     */
-    private $request;
-
-    /**
-     * Api constructor.
-     * @param ContainerInterface $container
-     * @param EntityManagerInterface $em
-     * @param SessionInterface $session
-     * @param RequestStack $request_stack
-     */
-    public function __construct(ContainerInterface $container, EntityManagerInterface $em, SessionInterface $session, RequestStack $request_stack)
-    {
-        $this->container = $container;
-        $this->em = $em;
-        $this->session = $session;
-        $this->request = $request_stack->getCurrentRequest();
-    }
-
-    /**
-     * this method is used to test jwt and if the account is ok else send false
-     * @param string $infos_jwt
-     * @param string $token
-     * @return bool
-     * @throws Exception
-     */
-    public function userIslogged(string $infos_jwt, string $token): bool
-    {
-        $em = $this->em;
-        $jwt = Jwt::decode($infos_jwt, $token);
-
-        if ($jwt === false) {
-            return false;
-        }
-
-        $account_token_search = [
-            "token" => $token,
-            "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            "ip" => $this->request->server->get("REMOTE_ADDR")
-        ];
-        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
-            $account_token_search = [
-                "token" => $token,
-                "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            ];
-        }
-
-        $account_token = $em->getRepository(AccountToken::class)->findOneBy($account_token_search);
-
-        if (!$account_token) {
-            return false;
-        }
-
-        $this->account = $em->getRepository(Account::class)->findOneBy([
-            "id" => $account_token->getAccount()->getId(),
-            "isActive" => true,
-        ]);
-
-        if (!$this->account) {
-            return false;
-        }
-
-        $this->account->setLastConnection(new \DateTime());
-        $em->persist($this->account);
-        $em->flush();
-
-        $this->getToken($this->account);
-        $this->session->set("jwt_infos", $jwt);
-        $this->session->set("account", $this->account);
-        $this->session->set("account_token", $account_token);
-
-        return true;
-    }
-
-    /**
-     * method that return the token for a account
-     * @param Account $account
-     * @return string
-     * @throws Exception
-     */
-    public function getToken(Account $account): string
-    {
-        $account_token = $this->em->getRepository(AccountToken::class)->findOneBy([
-            "account" => $account,
-            "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            "ip" => $this->request->server->get("REMOTE_ADDR")
-        ]);
-
-        $token = $account_token ? $account_token->getToken() : null;
-        $now = new \DateTime();
-
-        if ($token === null || $account_token->getEndToken() < $now) {
-            return $this->setToken($account, $account_token);
-        }
-
-        return $token;
-    }
-
-    /**
-     * @param Account $account
-     * @param $account_token
-     * @return string
-     * method that set a token for the account
-     * @throws Exception
-     */
-    public function setToken(Account $account, $account_token): string
-    {
-        $token = $this->generateToken();
-        $now = new \DateTime();
-        $end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
-
-        if (!$account_token) {
-            $account_token = new AccountToken();
-        }
-
-        $account_token->setToken($token);
-        $account_token->setUserAgent($this->request->server->get("HTTP_USER_AGENT"));
-        $account_token->setIp($this->request->server->get("REMOTE_ADDR"));
-        $account_token->setEndToken($end_token);
-        $account_token->setAccount($account);
-        $this->em->persist($account_token);
-        $this->em->flush();
-
-        $this->account = $account;
-        $this->session->set("account", $this->account);
-        $this->session->set("account_token", $account_token);
-
-        return $token;
-    }
-
-    /**
-     * generate a token for api
-     * @param int $length
-     * @return string
-     */
-    public function generateToken(int $length = 200): string
-    {
-        $string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
-        $token = "";
-        srand((double)microtime() * 1000000);
-        for ($i = 0; $i < $length; $i++) {
-            $token .= $string[rand() % strlen($string)];
-        }
-
-        return $token;
-    }
-
-    /**
-     * method that encode an object to a json
-     * @param $object
-     * @param string $type
-     * @return mixed
-     * @throws ExceptionInterface
-     * @throws AnnotationException
-     */
-    public function serializeObject($object, $type = "json")
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
-
-        return $serializer->normalize($object, $type, [
-            'circular_reference_handler' => function ($object) {
-                return $object->getId();
-            },
-            'groups' => 'main'
-        ]);
-    }
+				/**
+				 * @var ContainerInterface
+				 */
+				private $container;
+
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * @var SessionInterface
+				 */
+				private $session;
+
+				/**
+				 * @var Account
+				 */
+				private $account;
+
+				/**
+				 * @var Request|null
+				 */
+				private $request;
+
+				/**
+				 * Api constructor.
+				 * @param ContainerInterface $container
+				 * @param EntityManagerInterface $em
+				 * @param SessionInterface $session
+				 * @param RequestStack $request_stack
+				 */
+				public function __construct(ContainerInterface $container, EntityManagerInterface $em, SessionInterface $session, RequestStack $request_stack)
+				{
+								$this->container = $container;
+								$this->em = $em;
+								$this->session = $session;
+								$this->request = $request_stack->getCurrentRequest();
+				}
+
+				/**
+				 * this method is used to test jwt and if the account is ok else send false
+				 * @param string $infos_jwt
+				 * @param string $token
+				 * @return bool
+				 * @throws Exception
+				 */
+				public function userIslogged(string $infos_jwt, string $token): bool
+				{
+								$em = $this->em;
+								$jwt = Jwt::decode($infos_jwt, $token);
+
+								if ($jwt === false) {
+												return false;
+								}
+
+								$account_token_search = [
+												"token" => $token,
+												"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												"ip" => $this->request->server->get("REMOTE_ADDR")
+								];
+								if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
+												$account_token_search = [
+																"token" => $token,
+																"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												];
+								}
+
+								$account_token = $em->getRepository(AccountToken::class)->findOneBy($account_token_search);
+
+								if (!$account_token) {
+												return false;
+								}
+
+								$this->account = $em->getRepository(Account::class)->findOneBy([
+												"id" => $account_token->getAccount()->getId(),
+												"isActive" => true,
+								]);
+
+								if (!$this->account) {
+												return false;
+								}
+
+								$this->account->setLastConnection(new \DateTime());
+								$em->persist($this->account);
+								$em->flush();
+
+								$this->getToken($this->account);
+								$this->session->set("jwt_infos", $jwt);
+								$this->session->set("account", $this->account);
+								$this->session->set("account_token", $account_token);
+
+								return true;
+				}
+
+				/**
+				 * method that return the token for a account
+				 * @param Account $account
+				 * @return string
+				 * @throws Exception
+				 */
+				public function getToken(Account $account): string
+				{
+								$account_token = $this->em->getRepository(AccountToken::class)->findOneBy([
+												"account" => $account,
+												"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												"ip" => $this->request->server->get("REMOTE_ADDR")
+								]);
+
+								$token = $account_token ? $account_token->getToken() : null;
+								$now = new \DateTime();
+
+								if ($token === null || $account_token->getEndToken() < $now) {
+												return $this->setToken($account, $account_token);
+								}
+
+								return $token;
+				}
+
+				/**
+				 * @param Account $account
+				 * @param $account_token
+				 * @return string
+				 * method that set a token for the account
+				 * @throws Exception
+				 */
+				public function setToken(Account $account, $account_token): string
+				{
+								$token = $this->generateToken();
+								$now = new \DateTime();
+								$end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
+
+								if (!$account_token) {
+												$account_token = new AccountToken();
+								}
+
+								$account_token->setToken($token);
+								$account_token->setUserAgent($this->request->server->get("HTTP_USER_AGENT"));
+								$account_token->setIp($this->request->server->get("REMOTE_ADDR"));
+								$account_token->setEndToken($end_token);
+								$account_token->setAccount($account);
+								$this->em->persist($account_token);
+								$this->em->flush();
+
+								$this->account = $account;
+								$this->session->set("account", $this->account);
+								$this->session->set("account_token", $account_token);
+
+								return $token;
+				}
+
+				/**
+				 * generate a token for api
+				 * @param int $length
+				 * @return string
+				 */
+				public function generateToken(int $length = 200): string
+				{
+								$string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
+								$token = "";
+								srand((double)microtime() * 1000000);
+								for ($i = 0; $i < $length; $i++) {
+												$token .= $string[rand() % strlen($string)];
+								}
+
+								return $token;
+				}
+
+				/**
+				 * method that encode an object to a json
+				 * @param $object
+				 * @param string $type
+				 * @return mixed
+				 * @throws ExceptionInterface
+				 * @throws AnnotationException
+				 */
+				public function serializeObject($object, $type = "json")
+				{
+								$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+								$serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
+
+								return $serializer->normalize($object, $type, [
+												'circular_reference_handler' => function ($object) {
+																return $object->getId();
+												},
+												'groups' => 'main'
+								]);
+				}
 }

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
             "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
             "ip" => $this->request->server->get("REMOTE_ADDR")
         ];
-        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
+        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i', $this->request->server->get("HTTP_USER_AGENT")) || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i', substr($this->request->server->get("HTTP_USER_AGENT"), 0, 4))) {
             $account_token_search = [
                 "token" => $token,
                 "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
@@ -153,7 +153,7 @@ 
     {
         $token = $this->generateToken();
         $now = new \DateTime();
-        $end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
+        $end_token = $now->add(new \DateInterval("PT" . $this->container->getParameter("ribs_admin")["api_token_duration"] . "M"));
 
         if (!$account_token) {
             $account_token = new AccountToken();
@@ -183,7 +183,7 @@ 
     {
         $string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
         $token = "";
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         for ($i = 0; $i < $length; $i++) {
             $token .= $string[rand() % strlen($string)];
         }
@@ -205,7 +205,7 @@ 
         $serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
 
         return $serializer->normalize($object, $type, [
-            'circular_reference_handler' => function ($object) {
+            'circular_reference_handler' => function($object) {
                 return $object->getId();
             },
             'groups' => 'main'

Entity/CreatedUpdatedTrait.php

Indentation +76 added lines, -76 removed lines

@@ -6,91 +6,91 @@
 
 trait CreatedUpdatedTrait
 {
-    /**
-     * @ORM\Column(name="created_at", type="datetime", nullable=true)
-     */
-    protected $created_at;
+				/**
+				 * @ORM\Column(name="created_at", type="datetime", nullable=true)
+				 */
+				protected $created_at;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
-     */
-    protected $created_by;
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $created_by;
 
-    /**
-     * @ORM\Column(name="updated_at", type="datetime", nullable=true)
-     */
-    protected $updated_at;
+				/**
+				 * @ORM\Column(name="updated_at", type="datetime", nullable=true)
+				 */
+				protected $updated_at;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
-     */
-    protected $updated_by;
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $updated_by;
 
-    /**
-     * @return mixed
-     */
-    public function getCreatedAt()
-    {
-        return $this->created_at;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedAt()
+				{
+								return $this->created_at;
+				}
 
-    /**
-     * @param mixed $created_at
-     */
-    public function setCreatedAt($created_at)
-    {
-        $this->created_at = $created_at;
-    }
+				/**
+				 * @param mixed $created_at
+				 */
+				public function setCreatedAt($created_at)
+				{
+								$this->created_at = $created_at;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getCreatedBy()
-    {
-        return $this->created_by;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedBy()
+				{
+								return $this->created_by;
+				}
 
-    /**
-     * @ORM\PrePersist
-     * @param mixed $created_by
-     */
-    public function setCreatedBy($created_by)
-    {
-        $this->created_by = $created_by;
-    }
+				/**
+				 * @ORM\PrePersist
+				 * @param mixed $created_by
+				 */
+				public function setCreatedBy($created_by)
+				{
+								$this->created_by = $created_by;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getUpdatedAt()
-    {
-        return $this->updated_at;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedAt()
+				{
+								return $this->updated_at;
+				}
 
-    /**
-     * @param mixed $updated_at
-     */
-    public function setUpdatedAt($updated_at)
-    {
-        $this->updated_at = $updated_at;
-    }
+				/**
+				 * @param mixed $updated_at
+				 */
+				public function setUpdatedAt($updated_at)
+				{
+								$this->updated_at = $updated_at;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getUpdatedBy()
-    {
-        return $this->updated_by;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedBy()
+				{
+								return $this->updated_by;
+				}
 
-    /**
-     * @ORM\PreUpdate
-     * @param mixed $updated_by
-     */
-    public function setUpdatedBy($updated_by)
-    {
-        $this->updated_by = $updated_by;
-    }
+				/**
+				 * @ORM\PreUpdate
+				 * @param mixed $updated_by
+				 */
+				public function setUpdatedBy($updated_by)
+				{
+								$this->updated_by = $updated_by;
+				}
 }

EventListener/CreateUpdateAwareListener.php

Indentation +27 added lines, -27 removed lines

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

Entity/AccountToken.php

Indentation +153 added lines, -153 removed lines

@@ -16,157 +16,157 @@
  */
 class AccountToken
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
-
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $token;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $endToken;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $userAgent;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $ip;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
-     * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
-     */
-    protected $account;
-
-    /**
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param mixed $id
-     * @return AccountToken
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param mixed $token
-     * @return AccountToken
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getEndToken()
-    {
-        return $this->endToken;
-    }
-
-    /**
-     * @param mixed $endToken
-     * @return AccountToken
-     */
-    public function setEndToken($endToken)
-    {
-        $this->endToken = $endToken;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * @param mixed $userAgent
-     * @return AccountToken
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = $userAgent;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * @param mixed $ip
-     * @return AccountToken
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-
-        return $this;
-    }
-
-    /**
-     * Set Account entity (many to one).
-     *
-     * @param Account $account
-     * @return AccountToken
-     */
-    public function setAccount(Account $account = null)
-    {
-        $this->account = $account;
-
-        return $this;
-    }
-
-    /**
-     * Get Account entity (many to one).
-     *
-     * @return Account
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
+				use GuidTrait;
+				use CreatedUpdatedTrait;
+
+				/**
+				 * @ORM\Id
+				 * @ORM\Column(type="integer")
+				 * @ORM\GeneratedValue(strategy="AUTO")
+				 */
+				protected $id;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $token;
+
+				/**
+				 * @ORM\Column(type="datetime", nullable=true)
+				 */
+				protected $endToken;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $userAgent;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $ip;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
+				 * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
+				 */
+				protected $account;
+
+				/**
+				 * @return mixed
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param mixed $id
+				 * @return AccountToken
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getToken()
+				{
+								return $this->token;
+				}
+
+				/**
+				 * @param mixed $token
+				 * @return AccountToken
+				 */
+				public function setToken($token)
+				{
+								$this->token = $token;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getEndToken()
+				{
+								return $this->endToken;
+				}
+
+				/**
+				 * @param mixed $endToken
+				 * @return AccountToken
+				 */
+				public function setEndToken($endToken)
+				{
+								$this->endToken = $endToken;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getUserAgent()
+				{
+								return $this->userAgent;
+				}
+
+				/**
+				 * @param mixed $userAgent
+				 * @return AccountToken
+				 */
+				public function setUserAgent($userAgent)
+				{
+								$this->userAgent = $userAgent;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getIp()
+				{
+								return $this->ip;
+				}
+
+				/**
+				 * @param mixed $ip
+				 * @return AccountToken
+				 */
+				public function setIp($ip)
+				{
+								$this->ip = $ip;
+
+								return $this;
+				}
+
+				/**
+				 * Set Account entity (many to one).
+				 *
+				 * @param Account $account
+				 * @return AccountToken
+				 */
+				public function setAccount(Account $account = null)
+				{
+								$this->account = $account;
+
+								return $this;
+				}
+
+				/**
+				 * Get Account entity (many to one).
+				 *
+				 * @return Account
+				 */
+				public function getAccount()
+				{
+								return $this->account;
+				}
 }

Entity/Account.php

Indentation +43 added lines, -43 removed lines

@@ -12,8 +12,8 @@ 
  */
 class Account implements UserInterface, \Serializable
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
+				use GuidTrait;
+				use CreatedUpdatedTrait;
 
 	/**
 	 * @ORM\Id
@@ -47,16 +47,16 @@ 
 	 */
 	private $isActive;
 
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $last_connection;
+				/**
+				 * @ORM\Column(type="datetime", nullable=true)
+				 */
+				protected $last_connection;
 
-    /**
-     * @ORM\OneToMany(targetEntity="AccountToken", mappedBy="account")
-     * @ORM\JoinColumn(name="id", referencedColumnName="account_id", nullable=false)
-     */
-    protected $tokens;
+				/**
+				 * @ORM\OneToMany(targetEntity="AccountToken", mappedBy="account")
+				 * @ORM\JoinColumn(name="id", referencedColumnName="account_id", nullable=false)
+				 */
+				protected $tokens;
 	
 	/**
 	 * @var User
@@ -187,43 +187,43 @@ 
 		$this->user = $user;
 	}
 
-    /**
-     * @return mixed
-     */
-    public function getLastConnection()
-    {
-        return $this->last_connection;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getLastConnection()
+				{
+								return $this->last_connection;
+				}
 
-    /**
-     * @param mixed $last_connection
-     * @return Account
-     */
-    public function setLastConnection($last_connection)
-    {
-        $this->last_connection = $last_connection;
+				/**
+				 * @param mixed $last_connection
+				 * @return Account
+				 */
+				public function setLastConnection($last_connection)
+				{
+								$this->last_connection = $last_connection;
 
-        return $this;
-    }
+								return $this;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getTokens()
+				{
+								return $this->tokens;
+				}
 
-    /**
-     * @param mixed $tokens
-     * @return Account
-     */
-    public function setTokens($tokens)
-    {
-        $this->tokens = $tokens;
+				/**
+				 * @param mixed $tokens
+				 * @return Account
+				 */
+				public function setTokens($tokens)
+				{
+								$this->tokens = $tokens;
 
-        return $this;
-    }
+								return $this;
+				}
 	
 	/**
 	 * Returns the roles granted to the user.

Entity/Module.php

Indentation +293 added lines, -293 removed lines

@@ -14,297 +14,297 @@
  */
 class Module
 {
-    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="package_name", type="string", length=255, nullable=false)
-     */
-    private $packageName;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="title_tag", type="string", length=70, nullable=true)
-     */
-    private $titleTag;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
-     */
-    private $descriptionTag;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="title", type="string", length=255, nullable=false)
-     */
-    private $title;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="template", type="string", length=255, nullable=true)
-     */
-    private $template;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="url", type="string", length=255, nullable=true)
-     */
-    private $url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="url_admin", type="string", length=255, nullable=true)
-     */
-    private $urlAdmin;
-
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="active", type="boolean", nullable=false)
-     */
-    private $active;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="`order`", type="integer", nullable=true)
-     */
-    private $order;
-
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="displayed", type="boolean", nullable=false)
-     */
-    private $displayed;
-
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="dev_mode", type="boolean", nullable=false)
-     */
-    private $devMode = false;
-
-    /**
-     * @return int
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId(int $id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPackageName(): ?string
-    {
-        return $this->packageName;
-    }
-
-    /**
-     * @param string $package_name
-     */
-    public function setPackageName(string $package_name)
-    {
-        $this->packageName = $package_name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitleTag(): ?string
-    {
-        return $this->titleTag;
-    }
-
-    /**
-     * @param string $titleTag
-     */
-    public function setTitleTag(string $titleTag)
-    {
-        $this->titleTag = $titleTag;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescriptionTag(): ?string
-    {
-        return $this->descriptionTag;
-    }
-
-    /**
-     * @param string $descriptionTag
-     */
-    public function setDescriptionTag(string $descriptionTag)
-    {
-        $this->descriptionTag = $descriptionTag;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle(): ?string
-    {
-        return $this->title;
-    }
-
-    /**
-     * @param string $title
-     */
-    public function setTitle(string $title)
-    {
-        $this->title = $title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplate(): ?string
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param string $template
-     */
-    public function setTemplate(string $template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl(): ?string
-    {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     */
-    public function setUrl(string $url)
-    {
-        $this->url = $url;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrlAdmin(): ?string
-    {
-        return $this->urlAdmin;
-    }
-
-    /**
-     * @param string $urlAdmin
-     */
-    public function setUrlAdmin(string $urlAdmin)
-    {
-        $this->urlAdmin = $urlAdmin;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive(bool $active)
-    {
-        $this->active = $active;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOrder(): ?int
-    {
-        return $this->order;
-    }
-
-    /**
-     * @param int $order
-     */
-    public function setOrder(int $order)
-    {
-        $this->order = $order;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getDisplayed(): ?bool
-    {
-        return $this->displayed;
-    }
-
-    /**
-     * @param bool $displayed
-     */
-    public function setDisplayed(bool $displayed)
-    {
-        $this->displayed = $displayed;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getDevMode(): bool
-    {
-        return $this->devMode;
-    }
-
-    /**
-     * @param bool $devMode
-     * @return Module
-     */
-    public function setDevMode(bool $devMode): Module
-    {
-        $this->devMode = $devMode;
-
-        return $this;
-    }
-
-    public function getFormattedActive()
-    {
-        return $this->getActive() ? "Oui" : "Non";
-    }
-
-    public function getFormattedDisplayed()
-    {
-        return $this->getDisplayed() ? "Oui" : "Non";
-    }
+				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="package_name", type="string", length=255, nullable=false)
+				 */
+				private $packageName;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="title_tag", type="string", length=70, nullable=true)
+				 */
+				private $titleTag;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
+				 */
+				private $descriptionTag;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="title", type="string", length=255, nullable=false)
+				 */
+				private $title;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="template", type="string", length=255, nullable=true)
+				 */
+				private $template;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="url", type="string", length=255, nullable=true)
+				 */
+				private $url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="url_admin", type="string", length=255, nullable=true)
+				 */
+				private $urlAdmin;
+
+				/**
+				 * @var boolean
+				 *
+				 * @ORM\Column(name="active", type="boolean", nullable=false)
+				 */
+				private $active;
+
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="`order`", type="integer", nullable=true)
+				 */
+				private $order;
+
+				/**
+				 * @var boolean
+				 *
+				 * @ORM\Column(name="displayed", type="boolean", nullable=false)
+				 */
+				private $displayed;
+
+				/**
+				 * @var boolean
+				 *
+				 * @ORM\Column(name="dev_mode", type="boolean", nullable=false)
+				 */
+				private $devMode = false;
+
+				/**
+				 * @return int
+				 */
+				public function getId(): int
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 */
+				public function setId(int $id)
+				{
+								$this->id = $id;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getPackageName(): ?string
+				{
+								return $this->packageName;
+				}
+
+				/**
+				 * @param string $package_name
+				 */
+				public function setPackageName(string $package_name)
+				{
+								$this->packageName = $package_name;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getTitleTag(): ?string
+				{
+								return $this->titleTag;
+				}
+
+				/**
+				 * @param string $titleTag
+				 */
+				public function setTitleTag(string $titleTag)
+				{
+								$this->titleTag = $titleTag;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getDescriptionTag(): ?string
+				{
+								return $this->descriptionTag;
+				}
+
+				/**
+				 * @param string $descriptionTag
+				 */
+				public function setDescriptionTag(string $descriptionTag)
+				{
+								$this->descriptionTag = $descriptionTag;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getTitle(): ?string
+				{
+								return $this->title;
+				}
+
+				/**
+				 * @param string $title
+				 */
+				public function setTitle(string $title)
+				{
+								$this->title = $title;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getTemplate(): ?string
+				{
+								return $this->template;
+				}
+
+				/**
+				 * @param string $template
+				 */
+				public function setTemplate(string $template)
+				{
+								$this->template = $template;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getUrl(): ?string
+				{
+								return $this->url;
+				}
+
+				/**
+				 * @param string $url
+				 */
+				public function setUrl(string $url)
+				{
+								$this->url = $url;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getUrlAdmin(): ?string
+				{
+								return $this->urlAdmin;
+				}
+
+				/**
+				 * @param string $urlAdmin
+				 */
+				public function setUrlAdmin(string $urlAdmin)
+				{
+								$this->urlAdmin = $urlAdmin;
+				}
+
+				/**
+				 * @return boolean
+				 */
+				public function getActive(): ?bool
+				{
+								return $this->active;
+				}
+
+				/**
+				 * @param bool $active
+				 */
+				public function setActive(bool $active)
+				{
+								$this->active = $active;
+				}
+
+				/**
+				 * @return int
+				 */
+				public function getOrder(): ?int
+				{
+								return $this->order;
+				}
+
+				/**
+				 * @param int $order
+				 */
+				public function setOrder(int $order)
+				{
+								$this->order = $order;
+				}
+
+				/**
+				 * @return bool
+				 */
+				public function getDisplayed(): ?bool
+				{
+								return $this->displayed;
+				}
+
+				/**
+				 * @param bool $displayed
+				 */
+				public function setDisplayed(bool $displayed)
+				{
+								$this->displayed = $displayed;
+				}
+
+				/**
+				 * @return bool
+				 */
+				public function getDevMode(): bool
+				{
+								return $this->devMode;
+				}
+
+				/**
+				 * @param bool $devMode
+				 * @return Module
+				 */
+				public function setDevMode(bool $devMode): Module
+				{
+								$this->devMode = $devMode;
+
+								return $this;
+				}
+
+				public function getFormattedActive()
+				{
+								return $this->getActive() ? "Oui" : "Non";
+				}
+
+				public function getFormattedDisplayed()
+				{
+								return $this->getDisplayed() ? "Oui" : "Non";
+				}
 }

Entity/Page.php

Indentation +188 added lines, -188 removed lines

@@ -14,45 +14,45 @@ 
  */
 class Page
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
+				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 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="title_tag", type="string", length=70, nullable=true)
-     */
-    private $titleTag;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="title_tag", type="string", length=70, nullable=true)
+				 */
+				private $titleTag;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
-     */
-    private $descriptionTag;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
+				 */
+				private $descriptionTag;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="title", type="string", length=255, nullable=false)
-     */
-    private $title;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="title", type="string", length=255, nullable=false)
+				 */
+				private $title;
 	
 	/**
 	 * @var string
 	 *
 	 * @ORM\Column(name="template", type="string", length=255, nullable=false)
 	 */
-    private $template;
+				private $template;
 	
 	/**
 	 * @var string
@@ -61,107 +61,107 @@ 
 	 */
 	private $url;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="content", type="text", nullable=true)
-     */
-    private $content;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="content", type="text", nullable=true)
+				 */
+				private $content;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="active", type="integer", nullable=false)
-     */
-    private $active;
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="active", type="integer", nullable=false)
+				 */
+				private $active;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="order", type="integer", nullable=false)
-     */
-    private $order;
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="order", type="integer", nullable=false)
+				 */
+				private $order;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="displayed", type="integer", nullable=false)
-     */
-    private $displayed;
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="displayed", type="integer", nullable=false)
+				 */
+				private $displayed;
 
-    /**
-     * @var \Page
-     *
-     * @ORM\ManyToOne(targetEntity="Page")
-     * @ORM\JoinColumns({
-     *   @ORM\JoinColumn(name="parent", referencedColumnName="id")
-     * })
-     */
-    private $parent;
+				/**
+				 * @var \Page
+				 *
+				 * @ORM\ManyToOne(targetEntity="Page")
+				 * @ORM\JoinColumns({
+				 *   @ORM\JoinColumn(name="parent", referencedColumnName="id")
+				 * })
+				 */
+				private $parent;
 
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
+				/**
+				 * @return int
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
 
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
+				/**
+				 * @param int $id
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+				}
 
-    /**
-     * @return string
-     */
-    public function getTitleTag()
-    {
-        return $this->titleTag;
-    }
+				/**
+				 * @return string
+				 */
+				public function getTitleTag()
+				{
+								return $this->titleTag;
+				}
 
-    /**
-     * @param string $titleTag
-     */
-    public function setTitleTag($titleTag)
-    {
-        $this->titleTag = $titleTag;
-    }
+				/**
+				 * @param string $titleTag
+				 */
+				public function setTitleTag($titleTag)
+				{
+								$this->titleTag = $titleTag;
+				}
 
-    /**
-     * @return string
-     */
-    public function getDescriptionTag()
-    {
-        return $this->descriptionTag;
-    }
+				/**
+				 * @return string
+				 */
+				public function getDescriptionTag()
+				{
+								return $this->descriptionTag;
+				}
 
-    /**
-     * @param string $descriptionTag
-     */
-    public function setDescriptionTag($descriptionTag)
-    {
-        $this->descriptionTag = $descriptionTag;
-    }
+				/**
+				 * @param string $descriptionTag
+				 */
+				public function setDescriptionTag($descriptionTag)
+				{
+								$this->descriptionTag = $descriptionTag;
+				}
 
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
+				/**
+				 * @return string
+				 */
+				public function getTitle()
+				{
+								return $this->title;
+				}
 
-    /**
-     * @param string $title
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-    }
+				/**
+				 * @param string $title
+				 */
+				public function setTitle($title)
+				{
+								$this->title = $title;
+				}
 	
 	/**
 	 * @return string
@@ -195,84 +195,84 @@ 
 		$this->url = $url;
 	}
 
-    /**
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
+				/**
+				 * @return string
+				 */
+				public function getContent()
+				{
+								return $this->content;
+				}
 
-    /**
-     * @param string $content
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-    }
+				/**
+				 * @param string $content
+				 */
+				public function setContent($content)
+				{
+								$this->content = $content;
+				}
 
-    /**
-     * @return int
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
+				/**
+				 * @return int
+				 */
+				public function getActive()
+				{
+								return $this->active;
+				}
 
-    /**
-     * @param int $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active;
-    }
+				/**
+				 * @param int $active
+				 */
+				public function setActive($active)
+				{
+								$this->active = $active;
+				}
 
-    /**
-     * @return int
-     */
-    public function getOrder()
-    {
-        return $this->order;
-    }
+				/**
+				 * @return int
+				 */
+				public function getOrder()
+				{
+								return $this->order;
+				}
 
-    /**
-     * @param int $order
-     */
-    public function setOrder($order)
-    {
-        $this->order = $order;
-    }
+				/**
+				 * @param int $order
+				 */
+				public function setOrder($order)
+				{
+								$this->order = $order;
+				}
 
-    /**
-     * @return int
-     */
-    public function getDisplayed()
-    {
-        return $this->displayed;
-    }
+				/**
+				 * @return int
+				 */
+				public function getDisplayed()
+				{
+								return $this->displayed;
+				}
 
-    /**
-     * @param int $displayed
-     */
-    public function setDisplayed($displayed)
-    {
-        $this->displayed = $displayed;
-    }
+				/**
+				 * @param int $displayed
+				 */
+				public function setDisplayed($displayed)
+				{
+								$this->displayed = $displayed;
+				}
 
-    /**
-     * @return \Page
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
+				/**
+				 * @return \Page
+				 */
+				public function getParent()
+				{
+								return $this->parent;
+				}
 
-    /**
-     * @param \Page $parent
-     */
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
+				/**
+				 * @param \Page $parent
+				 */
+				public function setParent($parent)
+				{
+								$this->parent = $parent;
+				}
 }
 

Entity/UserLogs.php

Indentation +125 added lines, -125 removed lines

@@ -13,130 +13,130 @@
  */
 class UserLogs
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
-     */
-    private $user;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="method", type="string", length=255, nullable=false)
-     */
-    private $method;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="url", type="string", length=255, nullable=false)
-     */
-    private $url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="equest_parameters", type="json", nullable=true)
-     */
-    private $request_parameters;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return User
-     */
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param \User $user
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * @param string $method
-     * @return UserLogs
-     */
-    public function setMethod(string $method): UserLogs
-    {
-        $this->method = $method;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl(): string
-    {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     * @return UserLogs
-     */
-    public function setUrl(string $url): UserLogs
-    {
-        $this->url = $url;
-
-        return $this;
-    }
-
-
-    public function getRequestParameters()
-    {
-        return $this->request_parameters;
-    }
-
-    /**
-     * @param $request_parameters
-     * @return UserLogs
-     */
-    public function setRequestParameters($request_parameters): UserLogs
-    {
-        $this->request_parameters = $request_parameters;
-
-        return $this;
-    }
+				use GuidTrait;
+				use CreatedUpdatedTrait;
+
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="id", type="integer", nullable=false)
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
+				 */
+				private $id;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
+				 */
+				private $user;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="method", type="string", length=255, nullable=false)
+				 */
+				private $method;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="url", type="string", length=255, nullable=false)
+				 */
+				private $url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="equest_parameters", type="json", nullable=true)
+				 */
+				private $request_parameters;
+
+				/**
+				 * @return int
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+				}
+
+				/**
+				 * @return User
+				 */
+				public function getUser(): User
+				{
+								return $this->user;
+				}
+
+				/**
+				 * @param \User $user
+				 */
+				public function setUser($user)
+				{
+								$this->user = $user;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getMethod(): string
+				{
+								return $this->method;
+				}
+
+				/**
+				 * @param string $method
+				 * @return UserLogs
+				 */
+				public function setMethod(string $method): UserLogs
+				{
+								$this->method = $method;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getUrl(): string
+				{
+								return $this->url;
+				}
+
+				/**
+				 * @param string $url
+				 * @return UserLogs
+				 */
+				public function setUrl(string $url): UserLogs
+				{
+								$this->url = $url;
+
+								return $this;
+				}
+
+
+				public function getRequestParameters()
+				{
+								return $this->request_parameters;
+				}
+
+				/**
+				 * @param $request_parameters
+				 * @return UserLogs
+				 */
+				public function setRequestParameters($request_parameters): UserLogs
+				{
+								$this->request_parameters = $request_parameters;
+
+								return $this;
+				}
 }
 

Entity/Navigation.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
  */
 class Navigation
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
+				use GuidTrait;
+				use CreatedUpdatedTrait;
 
 	/**
 	 * @var integer