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'

EventListener/CreateUpdateAwareListener.php

Indentation +17 added lines, -17 removed lines

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

Entity/UserLogs.php

Indentation +132 added lines, -132 removed lines

@@ -13,137 +13,137 @@
  */
 class UserLogs
 {
-    use CreatedUpdatedTrait;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     */
-    private $id;
-
-    /**
-     * @var User
-     *
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
-     * @ORM\OneToOne(targetEntity="User")
-     * @ORM\JoinColumns({
-     *   @ORM\JoinColumn(name="user_id", referencedColumnName="id")
-     * })
-     */
-    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="text", 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;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestParameters(): string
-    {
-        return $this->request_parameters;
-    }
-
-    /**
-     * @param string $request_parameters
-     * @return UserLogs
-     */
-    public function setRequestParameters(string $request_parameters): UserLogs
-    {
-        $this->request_parameters = $request_parameters;
-
-        return $this;
-    }
+				use CreatedUpdatedTrait;
+
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="NONE")
+				 */
+				private $id;
+
+				/**
+				 * @var User
+				 *
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="NONE")
+				 * @ORM\OneToOne(targetEntity="User")
+				 * @ORM\JoinColumns({
+				 *   @ORM\JoinColumn(name="user_id", referencedColumnName="id")
+				 * })
+				 */
+				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="text", 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;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getRequestParameters(): string
+				{
+								return $this->request_parameters;
+				}
+
+				/**
+				 * @param string $request_parameters
+				 * @return UserLogs
+				 */
+				public function setRequestParameters(string $request_parameters): UserLogs
+				{
+								$this->request_parameters = $request_parameters;
+
+								return $this;
+				}
 }
 

Entity/AccessRight.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  */
 class AccessRight
 {
-    use CreatedUpdatedTrait;
+				use CreatedUpdatedTrait;
 
 	/**
 	 * @var integer

Entity/Module.php

Indentation +292 added lines, -292 removed lines

@@ -14,296 +14,296 @@
  */
 class Module
 {
-    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 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 +235 added lines, -235 removed lines

@@ -14,51 +14,51 @@ 
  */
 class Page
 {
-    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="guid", type="string", length=255, nullable=false)
-     */
-    private $guid;
-
-    /**
-     * @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;
+				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="guid", type="string", length=255, nullable=false)
+				 */
+				private $guid;
+
+				/**
+				 * @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=false)
 	 */
-    private $template;
+				private $template;
 	
 	/**
 	 * @var string
@@ -67,123 +67,123 @@ 
 	 */
 	private $url;
 
-    /**
-     * @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="order", type="integer", nullable=false)
-     */
-    private $order;
-
-    /**
-     * @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;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getGuid()
-    {
-        return $this->guid;
-    }
-
-    /**
-     * @param string $guid
-     */
-    public function setGuid($guid)
-    {
-        $this->guid = $guid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitleTag()
-    {
-        return $this->titleTag;
-    }
-
-    /**
-     * @param string $titleTag
-     */
-    public function setTitleTag($titleTag)
-    {
-        $this->titleTag = $titleTag;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescriptionTag()
-    {
-        return $this->descriptionTag;
-    }
-
-    /**
-     * @param string $descriptionTag
-     */
-    public function setDescriptionTag($descriptionTag)
-    {
-        $this->descriptionTag = $descriptionTag;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * @param string $title
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-    }
+				/**
+				 * @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="order", type="integer", nullable=false)
+				 */
+				private $order;
+
+				/**
+				 * @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;
+
+				/**
+				 * @return int
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getGuid()
+				{
+								return $this->guid;
+				}
+
+				/**
+				 * @param string $guid
+				 */
+				public function setGuid($guid)
+				{
+								$this->guid = $guid;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getTitleTag()
+				{
+								return $this->titleTag;
+				}
+
+				/**
+				 * @param string $titleTag
+				 */
+				public function setTitleTag($titleTag)
+				{
+								$this->titleTag = $titleTag;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getDescriptionTag()
+				{
+								return $this->descriptionTag;
+				}
+
+				/**
+				 * @param string $descriptionTag
+				 */
+				public function setDescriptionTag($descriptionTag)
+				{
+								$this->descriptionTag = $descriptionTag;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getTitle()
+				{
+								return $this->title;
+				}
+
+				/**
+				 * @param string $title
+				 */
+				public function setTitle($title)
+				{
+								$this->title = $title;
+				}
 	
 	/**
 	 * @return string
@@ -217,84 +217,84 @@ 
 		$this->url = $url;
 	}
 
-    /**
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * @param string $content
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-    }
-
-    /**
-     * @return int
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * @param int $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOrder()
-    {
-        return $this->order;
-    }
-
-    /**
-     * @param int $order
-     */
-    public function setOrder($order)
-    {
-        $this->order = $order;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDisplayed()
-    {
-        return $this->displayed;
-    }
-
-    /**
-     * @param int $displayed
-     */
-    public function setDisplayed($displayed)
-    {
-        $this->displayed = $displayed;
-    }
-
-    /**
-     * @return \Page
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * @param \Page $parent
-     */
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
+				/**
+				 * @return string
+				 */
+				public function getContent()
+				{
+								return $this->content;
+				}
+
+				/**
+				 * @param string $content
+				 */
+				public function setContent($content)
+				{
+								$this->content = $content;
+				}
+
+				/**
+				 * @return int
+				 */
+				public function getActive()
+				{
+								return $this->active;
+				}
+
+				/**
+				 * @param int $active
+				 */
+				public function setActive($active)
+				{
+								$this->active = $active;
+				}
+
+				/**
+				 * @return int
+				 */
+				public function getOrder()
+				{
+								return $this->order;
+				}
+
+				/**
+				 * @param int $order
+				 */
+				public function setOrder($order)
+				{
+								$this->order = $order;
+				}
+
+				/**
+				 * @return int
+				 */
+				public function getDisplayed()
+				{
+								return $this->displayed;
+				}
+
+				/**
+				 * @param int $displayed
+				 */
+				public function setDisplayed($displayed)
+				{
+								$this->displayed = $displayed;
+				}
+
+				/**
+				 * @return \Page
+				 */
+				public function getParent()
+				{
+								return $this->parent;
+				}
+
+				/**
+				 * @param \Page $parent
+				 */
+				public function setParent($parent)
+				{
+								$this->parent = $parent;
+				}
 }
 

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;
+				}
 }

Entity/User.php

Indentation +185 added lines, -185 removed lines

@@ -14,23 +14,23 @@ 
  */
 class User
 {
-    use CreatedUpdatedTrait;
+				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="guid", type="string", length=255, nullable=false)
-     */
-    private $guid;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="guid", type="string", length=255, nullable=false)
+				 */
+				private $guid;
 	
 	/**
 	 * @var AccessRight
@@ -38,63 +38,63 @@ 
 	 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\AccessRight", inversedBy="users")
 	 * @ORM\JoinColumn(name="id_access_right", referencedColumnName="id", nullable=true)
 	 */
-    private $accessRightList;
+				private $accessRightList;
 	
 	/**
 	 * @var boolean
 	 *
 	 * @ORM\Column(name="admin", type="boolean", nullable=true, options={"default": false})
 	 */
-    private $admin;
+				private $admin;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
-     */
-    private $firstname;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
+				 */
+				private $firstname;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
-     */
-    private $lastname;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
+				 */
+				private $lastname;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="adress", type="string", length=255, nullable=true)
-     */
-    private $adress;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="adress", type="string", length=255, nullable=true)
+				 */
+				private $adress;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
-     */
-    private $postalCode;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
+				 */
+				private $postalCode;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="country", type="string", length=100, nullable=true)
-     */
-    private $country;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="country", type="string", length=100, nullable=true)
+				 */
+				private $country;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="state", type="string", length=255, nullable=true)
-     */
-    private $state;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="state", type="string", length=255, nullable=true)
+				 */
+				private $state;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="access_rights", type="text", nullable=true)
-     */
-    private $accessRights;
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="access_rights", type="text", nullable=true)
+				 */
+				private $accessRights;
 	
 	/**
 	 * @var boolean
@@ -103,37 +103,37 @@ 
 	 */
 	private $archived = false;
 
-    /**
-     * @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 getGuid()
-    {
-        return $this->guid;
-    }
+				/**
+				 * @return string
+				 */
+				public function getGuid()
+				{
+								return $this->guid;
+				}
 
-    /**
-     * @param string $guid
-     */
-    public function setGuid($guid)
-    {
-        $this->guid = $guid;
-    }
+				/**
+				 * @param string $guid
+				 */
+				public function setGuid($guid)
+				{
+								$this->guid = $guid;
+				}
 	
 	/**
 	 * @return AccessRight
@@ -167,117 +167,117 @@ 
 		$this->admin = $admin;
 	}
 
-    /**
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
+				/**
+				 * @return string
+				 */
+				public function getFirstname()
+				{
+								return $this->firstname;
+				}
 
-    /**
-     * @param string $firstname
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = $firstname;
-    }
+				/**
+				 * @param string $firstname
+				 */
+				public function setFirstname($firstname)
+				{
+								$this->firstname = $firstname;
+				}
 
-    /**
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->lastname;
-    }
+				/**
+				 * @return string
+				 */
+				public function getLastname()
+				{
+								return $this->lastname;
+				}
 
-    /**
-     * @param string $lastname
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = $lastname;
-    }
+				/**
+				 * @param string $lastname
+				 */
+				public function setLastname($lastname)
+				{
+								$this->lastname = $lastname;
+				}
 
-    /**
-     * @return string
-     */
-    public function getAdress()
-    {
-        return $this->adress;
-    }
+				/**
+				 * @return string
+				 */
+				public function getAdress()
+				{
+								return $this->adress;
+				}
 
-    /**
-     * @param string $adress
-     */
-    public function setAdress($adress)
-    {
-        $this->adress = $adress;
-    }
+				/**
+				 * @param string $adress
+				 */
+				public function setAdress($adress)
+				{
+								$this->adress = $adress;
+				}
 
-    /**
-     * @return string
-     */
-    public function getPostalCode()
-    {
-        return $this->postalCode;
-    }
+				/**
+				 * @return string
+				 */
+				public function getPostalCode()
+				{
+								return $this->postalCode;
+				}
 
-    /**
-     * @param string $postalCode
-     */
-    public function setPostalCode($postalCode)
-    {
-        $this->postalCode = $postalCode;
-    }
+				/**
+				 * @param string $postalCode
+				 */
+				public function setPostalCode($postalCode)
+				{
+								$this->postalCode = $postalCode;
+				}
 
-    /**
-     * @return string
-     */
-    public function getCountry()
-    {
-        return $this->country;
-    }
+				/**
+				 * @return string
+				 */
+				public function getCountry()
+				{
+								return $this->country;
+				}
 
-    /**
-     * @param string $country
-     */
-    public function setCountry($country)
-    {
-        $this->country = $country;
-    }
+				/**
+				 * @param string $country
+				 */
+				public function setCountry($country)
+				{
+								$this->country = $country;
+				}
 
-    /**
-     * @return string
-     */
-    public function getState()
-    {
-        return $this->state;
-    }
+				/**
+				 * @return string
+				 */
+				public function getState()
+				{
+								return $this->state;
+				}
 
-    /**
-     * @param string $state
-     */
-    public function setState($state)
-    {
-        $this->state = $state;
-    }
+				/**
+				 * @param string $state
+				 */
+				public function setState($state)
+				{
+								$this->state = $state;
+				}
 
-    /**
-     * @return string
-     */
-    public function getAccessRights()
-    {
-        return $this->accessRights;
-    }
+				/**
+				 * @return string
+				 */
+				public function getAccessRights()
+				{
+								return $this->accessRights;
+				}
 
-    /**
-     * @param string $accessRights
-     */
-    public function setAccessRights($accessRights)
-    {
-        $this->accessRights = $accessRights;
-    }
+				/**
+				 * @param string $accessRights
+				 */
+				public function setAccessRights($accessRights)
+				{
+								$this->accessRights = $accessRights;
+				}
 	
 	/**
 	 * @return boolean

Entity/Navigation.php

Indentation +1 added lines, -1 removed lines

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