Merge branch 'hotfix'

.env.test

@@ -1,4 +1,10 @@
-# define your env variables for the test env here
-KERNEL_CLASS='Symfony\Component\HttpKernel\Kernel\AppKernel'
-APP_SECRET='s$cretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
+    APP_ENV=test
+    APP_URL_PREFIX="/phoenix"
+    APP_LANGUAGE="fr"
+
+    # define your env variables for the test env here
+    KERNEL_CLASS='Logipro\Phoenix\Kernel\AppKernel'
+    APP_SECRET='s$cretf0rt3st'
+    SYMFONY_DEPRECATIONS_HELPER=999999
+
+    DATABASE_TEST_URL="sqlite:///%kernel.project_dir%/var/app.db"

composer.json

@@ -10,6 +10,11 @@
 			"Logipro\\Phoenix\\" : "src/Phoenix"
 		}
 	},
+	"autoload-dev": {
+        "psr-4": {
+            "Logipro\\Phoenix\\tests\\": "tests/"
+        }
+    },
 	"require" : {
 		"symfony/flex" : "~1.1",
 		"symfony/console" : "~4.0",

config/packages/security.yaml

@@ -68,12 +68,14 @@ security:
     - { path: ^/learning-space, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
     - { path: ^/catalog, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
     - { path: ^/settings, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
+
     # ressource cache (mignature image)
     - { path: ^/media/cache/resolve/my_thumb, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
 
     # Zone de telechargmement de document accessible à toute personne connectée
     - { path: ^/file, roles: [IS_AUTHENTICATED_REMEMBERED] }
     - { path: ^/upload/download, roles: [IS_AUTHENTICATED_REMEMBERED] }
+    - { path: ^/scorm, roles: [IS_AUTHENTICATED_REMEMBERED] }
 
     # Espace reserver aux Owner
     - { path: ^/owner-space, roles: [ROLE_TRAINER, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }

src/Phoenix/Component/PhxCrypt.php

@@ -6,6 +6,11 @@ class PhxCrypt
     private static $cryptPassword = "__Pas.s:Word_!/_";
     private static $cryptIV = '1234567812345678';
 
+    protected static function serialize(array $data): string
+    {
+        return serialize($data);
+    }
+
     public static function crypt($data,$withDate = true)
     {
         if (is_string($data))
@@ -15,7 +20,7 @@ class PhxCrypt
         
         $data['_d_'] = time();
 
-        $data = serialize($data);
+        $data = self::serialize($data);
 		$openSslCrypt = openssl_encrypt($data, 'aes128',self::$cryptPassword,0,self::$cryptIV);
         return rtrim(strtr(($openSslCrypt), '+/', '-_'), '=');
     }

src/Phoenix/Controller/AppController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Controller;
 
 use Symfony\Component\HttpFoundation\Response;
@@ -36,12 +37,10 @@ class AppController extends AbstractController
 		FormHandler $formHandler,
 		EventDispatcherInterface $dispatcher = null,
 		ImageListener $listener = null
-	)
-	{
+	) {
 		// FIXME parfois le dispatcher est à null
 		// cas trouvé: file/download/{[id]}
-		if ($dispatcher && $listener)
-		{
+		if ($dispatcher && $listener) {
 			$dispatcher->addListener(\Vich\UploaderBundle\Event\Events::PRE_REMOVE, [$listener, 'preRemove']);
 		}
 		$this->formHandler = $formHandler;
@@ -65,7 +64,7 @@ class AppController extends AbstractController
 		return $this->formHandler->validForm($form);
 	}
 
-    /**
+	/**
 	 * retourne le manager de la BD
 	 * 
 	 * @param string $name
@@ -73,8 +72,7 @@ class AppController extends AbstractController
 	protected function getManager($name = null)
 	{
 		$doctrine = $this->getDoctrine();
-		if (!$doctrine)
-		{
+		if (!$doctrine) {
 			return;
 		}
 		return $doctrine->getManager($name);
@@ -86,11 +84,10 @@ class AppController extends AbstractController
 	 * @param $class
 	 * @param $managerName
 	 */
-	protected function getRepository($class,$managerName = null)
+	protected function getRepository($class, $managerName = null)
 	{
 		$manager = $this->getManager($managerName);
-		if (!$manager)
-		{
+		if (!$manager) {
 			return;
 		}
 		return $manager->getRepository($class);
@@ -102,22 +99,20 @@ class AppController extends AbstractController
 	 * @param $const
 	 * @param $number
 	 */
-	protected function translate($const,$number = null,$params = array(),$namespace = null)
+	protected function translate($const, $number = null, $params = array(), $namespace = null)
 	{
 		$translator = $this->get('translator');
-		if (!$translator)
-		{
+		if (!$translator) {
 			return $const;
 		}
-		if ($number)
-		{
+		if ($number) {
 			$params['count'] = $number;
-			return $translator->trans($const,$params,$namespace);
+			return $translator->trans($const, $params, $namespace);
 		}
-		return $translator->trans($const,$params,$namespace);
-    }
-    
-    /**
+		return $translator->trans($const, $params, $namespace);
+	}
+
+	/**
 	 * équivalent de render avec ajout de variable communes
 	 * 
 	 * @param string $view
@@ -127,34 +122,32 @@ class AppController extends AbstractController
 	 */
 	protected function phxRender(string $view, array $parameters = array(), Response $response = null): Response
 	{
-        // étend les variables de rendu
+		// étend les variables de rendu
 		$this->extendsRenderVars($parameters);
-		
+
 		return $this->render($view, $parameters, $response);
 	}
 
-	protected function renderBlock(string $blockName,string $view,array $parameters = array())
+	protected function renderBlock(string $blockName, string $view, array $parameters = array())
 	{
-		$content = $this->renderBlockView($blockName,$view,$parameters);
+		$content = $this->renderBlockView($blockName, $view, $parameters);
 		return new Response($content);
 	}
 
-	protected function renderBlockView(string $blockName,string $view,array $parameters = array())
+	protected function renderBlockView(string $blockName, string $view, array $parameters = array())
 	{
 		$template = $this->container->get('twig')->load($view);
-		$result =  $template->renderBlock($blockName,$parameters);
+		$result =  $template->renderBlock($blockName, $parameters);
 		return $result;
 	}
 
-    /**
-     * étend les variables pour tous les rendus de la classe
-     * à surcharger pour chacun des espaces
-     */
+	/**
+	 * étend les variables pour tous les rendus de la classe
+	 * à surcharger pour chacun des espaces
+	 */
 	protected function extendsRenderVars(&$parameters)
 	{
-		$golbalParameters = array
-		(
-		);
+		$golbalParameters = array();
 		$parameters = array_merge($golbalParameters, $parameters);
 	}
 
@@ -162,10 +155,10 @@ class AppController extends AbstractController
 	 * équivalent de renderView avec ajout de variable communes
 	 */
 	protected function phxRenderView(string $view, array $parameters = array()): string
-    {
-        // étend les variables de rendu
-        $this->extendsRenderVars($parameters);
-        
+	{
+		// étend les variables de rendu
+		$this->extendsRenderVars($parameters);
+
 		return $this->renderView($view, $parameters);
 	}
 
@@ -177,7 +170,7 @@ class AppController extends AbstractController
 	 * 
 	 * @eturn string
 	 */
-	public function renderString($string,$renderVars = array())
+	public function renderString($string, $renderVars = array())
 	{
 		$twig = $this->get('twig');
 		// garde l'ancien loader
@@ -185,10 +178,10 @@ class AppController extends AbstractController
 		// change le loader
 		$twig->setLoader(new \Twig\Loader\ArrayLoader(['string' => $string]));
 		// fait le rendu
-		$content = $twig->render('string',$renderVars);
+		$content = $twig->render('string', $renderVars);
 		// remet le loader
 		$twig->setLoader($oldLoader);
-		
+
 		return $content;
 	}
 
@@ -204,8 +197,7 @@ class AppController extends AbstractController
 	 */
 	public function arrayGet($array, $key, $default = null)
 	{
-		if (array_key_exists($key, $array))
-		{
+		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		}
 		return $default;
@@ -219,15 +211,15 @@ class AppController extends AbstractController
 	 * 
 	 * @deprecated use FormHandler::getFormFieldError instead
 	 */
-	protected function getFormFieldError(Form $form) : array
-	{    
+	protected function getFormFieldError(Form $form): array
+	{
 		return $this->formHandler->getFormFieldError($form);
 	}
 
 	/**
 	 * @deprecated  use FormHandler::getViewId instead
 	 */
-	protected function getViewId(Form $form) : string
+	protected function getViewId(Form $form): string
 	{
 		return $this->formHandler->getViewId($form);
 	}
@@ -238,7 +230,7 @@ class AppController extends AbstractController
 	 */
 	protected function getFormFieldErrorMessage(Form $form)
 	{
-		return $this->formHandler->getFormFieldErrorMessage($form);	
+		return $this->formHandler->getFormFieldErrorMessage($form);
 	}
 
 	/**
@@ -250,7 +242,7 @@ class AppController extends AbstractController
 	 * 
 	 * @deprecated use FormHandler::serializeFormFieldError instead
 	 */
-	protected function serializeFormFieldError($errors) : string
+	protected function serializeFormFieldError($errors): string
 	{
 		return $this->formHandler->serializeFormFieldError($errors);
 	}
@@ -258,37 +250,33 @@ class AppController extends AbstractController
 	/**
 	 * @deprecated use FormHandler::addFormError instead
 	 */
-	protected function addFormError(\Symfony\Component\Form\Form $form,$baseMessage,$templateMessage = null)
+	protected function addFormError(\Symfony\Component\Form\Form $form, $baseMessage, $templateMessage = null)
 	{
-		return $this->formHandler->addFormError($form,$baseMessage,$templateMessage);
+		return $this->formHandler->addFormError($form, $baseMessage, $templateMessage);
 	}
 
-	private function getUploadFile($token,$factory,$responseHeader)
+	private function getUploadFile($token, $factory, $responseHeader)
 	{
 		$tokenData = PhxCrypt::decrypt($token);
-		if (!is_array($tokenData))
-		{
+		if (!is_array($tokenData)) {
 			throw new \Exception();
 		}
 
 		$attribut = $tokenData[1];
 
 		$entityName = '\\Logipro\\Phoenix\\Entity\\' . $tokenData[0];
-		
+
 		$manager = $this->getDoctrine()->getManager();
 		$repository = $manager->getRepository($entityName);
 		$object = $repository->find($tokenData[2]);
 
 		$search = null;
-		if ($object)
-		{
+		if ($object) {
 			$mapping = $factory->fromObject($object);
 
-			foreach ($mapping as $map)
-			{
+			foreach ($mapping as $map) {
 				$attribut = $map->getFileNamePropertyName();
-				if ($attribut == $tokenData[1])
-				{
+				if ($attribut == $tokenData[1]) {
 					$search = $map;
 					break;
 				}
@@ -298,28 +286,27 @@ class AppController extends AbstractController
 		$getter = 'get' . ucfirst($attribut);
 		$path = $search->getUploadDestination() . DIRECTORY_SEPARATOR . $object->$getter();
 
-		return $this->creatFileResponse($path,$object->getDownloadName($attribut),$responseHeader);
+		return $this->creatFileResponse($path, $object->getDownloadName($attribut), $responseHeader);
 	}
 
-	public function donwloadUpload($token,PropertyMappingFactory $factory)
+	public function donwloadUpload($token, PropertyMappingFactory $factory)
 	{
-		return $this->getUploadFile($token,$factory,ResponseHeaderBag::DISPOSITION_ATTACHMENT);
+		return $this->getUploadFile($token, $factory, ResponseHeaderBag::DISPOSITION_ATTACHMENT);
 	}
 
-	public function drawUpload($token,PropertyMappingFactory $factory)
+	public function drawUpload($token, PropertyMappingFactory $factory)
 	{
-		return $this->getUploadFile($token,$factory,ResponseHeaderBag::DISPOSITION_INLINE);
+		return $this->getUploadFile($token, $factory, ResponseHeaderBag::DISPOSITION_INLINE);
 	}
 
-	public function creatFileResponse($path,$name,$disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
+	public function creatFileResponse($path, $name, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
 	{
-		if (file_exists($path))
-		{
-			$fileName = PhxFileGuesser::guessDownloadName($path,$name);
-			$mime = PhxFileGuesser::guessMimeTypeByPath($path,$name);
+		if (file_exists($path)) {
+			$fileName = PhxFileGuesser::guessDownloadName($path, $name);
+			$mime = PhxFileGuesser::guessMimeTypeByPath($path, $name);
 
 			$response = new BinaryFileResponse($path);
-			$response->headers->set('Content-Type',$mime);
+			$response->headers->set('Content-Type', $mime);
 			$response->setContentDisposition(
 				$disposition,
 				$fileName
@@ -329,6 +316,26 @@ class AppController extends AbstractController
 		}
 		return null;
 	}
-	
 
-}
+	/**
+	 * Amélioration de file_put_contents
+	 * Ici la méthode crée les dossiers contenu dans le chemin
+	 * si ces derniers n'existent pas
+	 * 
+	 * @param string $fullPath
+	 * @param mixed $contents
+	 * @param int $flags
+	 */
+	protected function file_force_contents($fullPath, $contents, $flags = 0)
+	{
+		$parts = explode('/', $fullPath);
+		array_pop($parts);
+		$dir = implode('/', $parts);
+
+		if (!is_dir($dir)) {
+			mkdir($dir, 0777, true);
+		}
+
+		file_put_contents($fullPath, $contents, $flags);
+	}
+}

src/Phoenix/Controller/Catalog/LoginController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Controller\Catalog;
 
 use Logipro\Phoenix\Events;
@@ -32,11 +33,11 @@ use Logipro\Phoenix\Service\LoginService;
 class LoginController extends CatalogController
 {
 	protected function phxRenderView(string $view, array $parameters = array()): string
-    {
-		$view = str_replace($this->viewPath,'',$view);
+	{
+		$view = str_replace($this->viewPath, '', $view);
 		$view = $this->viewPath . $view;
 
-		return parent::phxRenderView($view,$parameters);
+		return parent::phxRenderView($view, $parameters);
 	}
 
 	private function createLoginForm()
@@ -63,16 +64,16 @@ class LoginController extends CatalogController
 	private function createRecoverForm()
 	{
 		$formBuilder = $this->createFormBuilder();
-		
+
 		$formBuilder->add('username', TextType::class, array(
-			'required' => true, 
+			'required' => true,
 			'label_format' => 'catalog_recover_%id%'
 		));
 
 		return $formBuilder->getForm();
 	}
 
-	public function manageLogin(Request $request, UserPasswordEncoderInterface $passwordEncoder,SessionInterface $session)
+	public function manageLogin(Request $request, UserPasswordEncoderInterface $passwordEncoder, SessionInterface $session)
 	{
 		$continue = $request->request->get('continue');
 
@@ -80,7 +81,7 @@ class LoginController extends CatalogController
 
 		$formLogin = $this->createLoginForm();
 
-		$formSubscribe = $this->createForm(CatalogSubscribeType::class,$person); 
+		$formSubscribe = $this->createForm(CatalogSubscribeType::class, $person);
 
 		$formRecover = $this->createRecoverForm();
 
@@ -95,14 +96,13 @@ class LoginController extends CatalogController
 			"form_recover" => $formRecover->createView()
 		);
 
-		$html = $this->phxRenderView('layouts/partials/header/modal-login-content.html.twig',$renderVars);
+		$html = $this->phxRenderView('layouts/partials/header/modal-login-content.html.twig', $renderVars);
 
 		$response['html'] = $html;
 		$response['nav'] = $this->phxRenderView('layouts/partials/header/header.html.twig');
-		
+
 		$response['success'] = false;
-		if ($this->getUser())
-		{
+		if ($this->getUser()) {
 			$response['success'] = true;
 		}
 		$response['continue'] = $continue;
@@ -110,63 +110,56 @@ class LoginController extends CatalogController
 		return $this->json($response);
 	}
 
-	public function validateSubscribe(Request $request,LearnerAccountGenerator $accountGenerator,ValidatorInterface $validator, EventDispatcherInterface $eventDispatcher,LoginService $loginService)
+	public function validateSubscribe(Request $request, LearnerAccountGenerator $accountGenerator, ValidatorInterface $validator, EventDispatcherInterface $eventDispatcher, LoginService $loginService)
 	{
 		// si l'utilisateur est connecté => erreur
-		if ($this->getLearnerSpaceUser())
-		{
+		if ($this->getLearnerSpaceUser()) {
 			throw $this->createAccessDeniedException($this->translate('error_403_message'));
 		}
-		
+
 		$person = new Person();
 
 		$service = $this->get('phxSettings');
 		$person->setSociety($service->getDefaultSociety());
 
-		$formSubscribe = $this->createForm(CatalogSubscribeType::class,$person); 
+		$formSubscribe = $this->createForm(CatalogSubscribeType::class, $person);
 
 		$succes = $error = null;
 
 		$response = array();
-		try
-		{
-			if ($request->isMethod('POST'))
-			{
+		try {
+			if ($request->isMethod('POST')) {
 				$formSubscribe->handleRequest($request);
 
 				// valide l'objet distant et remonte l'erreur sur le formulaire d'origine
 				$result = $validator->validate($person->getLearnerAccount());
 				$learnerAccountField = $formSubscribe->get('learnerAccount');
-				foreach ($result as $error)
-				{
-					$this->addFormError($learnerAccountField->get($error->getPropertyPath()),$error->getMessage());
+				foreach ($result as $error) {
+					$this->addFormError($learnerAccountField->get($error->getPropertyPath()), $error->getMessage());
 				}
 
 				// test rgpd
 				$rgpdField = $formSubscribe->get('rgpd');
-				if (!$rgpdField->getData())
-				{
+				if (!$rgpdField->getData()) {
 					// ajoute une erreur sur le champ
 					$message = 'la case doit être cochée';
-					$this->addFormError($rgpdField,$message);
+					$this->addFormError($rgpdField, $message);
 				}
 
 				// test le mot de passe
 				$plainPasswordField = $learnerAccountField->get('plainPassword')->get('first');
 				$plainPassword = $plainPasswordField->getData();
-				$errorMsg = PasswordValidator::renderError($this->get('translator'),$this->get('phxSettings'),$plainPassword);
-				if ($errorMsg != '')
-				{
-					$this->addFormError($plainPasswordField,$errorMsg);
+				$errorMsg = PasswordValidator::renderError($this->get('translator'), $this->get('phxSettings'), $plainPassword);
+				if ($errorMsg != '') {
+					$this->addFormError($plainPasswordField, $errorMsg);
 				}
 
-				if ($formSubscribe->isSubmitted() && $formSubscribe->isValid())
-				{
+				if ($formSubscribe->isSubmitted() && $formSubscribe->isValid()) {
 					$learnerAccount = $accountGenerator->generateLearnerAccount($person);
 
 					//$learnerAccount = $person->getLearnerAccount();
 					$encoder = $this->get('security.password_encoder');
-					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount,$plainPassword));
+					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount, $plainPassword));
 					$learnerAccount->setUsername($learnerAccountField->get('username')->getData());
 					$learnerAccount->setStatus(EnumAccountStatusType::STATUS_ENABLED);
 					$person->setLearnerAccount($learnerAccount);
@@ -176,40 +169,34 @@ class LoginController extends CatalogController
 
 					$manager->persist($person);
 					$manager->persist($learnerAccount);
-					
+
 					$manager->flush();
 
 					// connecte l'utilisateur
-					$loginService->loginCatalogUser($learnerAccount,$plainPassword);
+					$loginService->loginCatalogUser($learnerAccount, $plainPassword);
 
 					// envoi l'email
 					$event = new GenericEvent($person);
-					$eventDispatcher->dispatch($event,Events::LEARNER_SUBSCRIBE);
+					$eventDispatcher->dispatch($event, Events::LEARNER_SUBSCRIBE);
 
 					$succes = true;
-				}
-				else
-				{
+				} else {
 					$errors = $this->getFormFieldError($formSubscribe);
 					throw $this->createNotFoundException($this->serializeFormFieldError($errors));
 				}
 			}
-		}
-		catch (\Exception $exp)
-		{
+		} catch (\Exception $exp) {
 			$succes = false;
-			
+
 			$errors = $this->getFormFieldError($formSubscribe);
 
 			$response['error'] = $exp->getMessage();
 			$response['formError'] = array();
 
 			// parcours les erreurs
-			foreach ($errors as $fieldId => $errorField)
-			{
+			foreach ($errors as $fieldId => $errorField) {
 				$message = $this->getFormFieldErrorMessage($errorField);
-				if ($message)
-				{
+				if ($message) {
 					$response['formError'][$fieldId] = $message;
 				}
 			}
@@ -224,36 +211,29 @@ class LoginController extends CatalogController
 
 	public function validateRecover(Request $request, EventDispatcherInterface $eventDispatcher)
 	{
-		if ($this->getLearnerSpaceUser())
-		{
+		if ($this->getLearnerSpaceUser()) {
 			throw $this->createErrorException($this->translate('error_recover_password_logged'));
 		}
 
 		$error = $succes = null;
-		try
-		{
-			if ($request->isMethod('POST'))
-			{
+		try {
+			if ($request->isMethod('POST')) {
 				$formRecover = $this->createRecoverForm();
 				$formRecover->handleRequest($request);
-				if ($formRecover->isSubmitted() && $formRecover->isValid())
-				{
+				if ($formRecover->isSubmitted() && $formRecover->isValid()) {
 					// cherche le compte
 					$learnerAccountRepository = $this->getRepository(LearnerAccount::class);
 					$learnerAccountSearch = $learnerAccountRepository->loadUserByUsername($formRecover->get('username')->getData());
-					if (!$learnerAccountSearch)
-					{
+					if (!$learnerAccountSearch) {
 						throw $this->createNotFoundException();
 					}
 
 					// déclanche l'événement du mail
 					$event = new GenericEvent($learnerAccountSearch);
-					$eventDispatcher->dispatch($event,Events::LEARNER_RECOVER_ON_CATALOG);
+					$eventDispatcher->dispatch($event, Events::LEARNER_RECOVER_ON_CATALOG);
 				}
 			}
-		}
-		catch (\Exception $exp)
-		{
+		} catch (\Exception $exp) {
 			$error = $exp->getMessage();
 		}
 
@@ -268,8 +248,7 @@ class LoginController extends CatalogController
 
 	public function validateLogout(Request $request)
 	{
-		if (!$this->getLearnerSpaceUser())
-		{
+		if (!$this->getLearnerSpaceUser()) {
 			throw $this->createAccessDeniedException($this->translate('error_403_message'));
 		}
 
@@ -281,84 +260,85 @@ class LoginController extends CatalogController
 		$session->set('_security_' . $name, null);
 		$session->save();
 
-//		$request->getSession()->invalidate();
+		//		$request->getSession()->invalidate();
 
 		$response['nav'] = $this->phxRenderView('layouts/partials/header/header.html.twig');
 		return $this->json($response);
 	}
 
-	public function manageDefinePassword(Request $request,LoginService $loginService)
+	public function manageDefinePassword(Request $request, LoginService $loginService)
 	{
-		if ($this->getLearnerSpaceUser())
-		{
+		if ($this->getLearnerSpaceUser()) {
 			throw $this->createErrorException($this->translate('error_recover_password_logged'));
 		}
 		$token = $request->get('token');
+		if (!$token) {
+			throw $this->createNotFoundException($this->translate('error_403_message'));
+		}
 
 		$tokenData = PasswordRecoverNotifyLearner::decrytUrlArg($token);
-		if (!$tokenData)
-		{
-			throw $this->createNotFoundException($this->translate('error_403_message'));
+		if (!$tokenData) {
+			$response = new Response('', 404);
+
+			// token expiré
+			$parameters = array(
+				'text' => $this->translate('catalog_password_expired'),
+				'path' => 'catalog_homepage',
+				'go' => $this->translate('catalog_password_return')
+			);
+			return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters,$response);
 		}
 
 		$respository = $this->getRepository(LearnerAccount::class);
 		$learnerAccount = $respository->findOneBy(array('learnerAccountId' => $tokenData['learnerAccountId']));
-		if (!$learnerAccount)
-		{
+		if (!$learnerAccount) {
 			throw $this->createNotFoundException($this->translate('error_403_message'));
 		}
-		$form = $this->createForm(CatalogDefinePasswordType::class,$learnerAccount); 
+		$form = $this->createForm(CatalogDefinePasswordType::class, $learnerAccount);
 
-		try
-		{
-			if ($request->isMethod('POST'))
-			{
+		try {
+			if ($request->isMethod('POST')) {
 				$form->handleRequest($request);
 
 				// test le mot de passe
 				$plainPasswordField = $form->get('plainPassword')->get('first');
 				$plainPassword = $plainPasswordField->getData();
-				$errorMsg = PasswordValidator::renderError($this->get('translator'),$this->get('phxSettings'),$plainPassword);
-				if ($errorMsg != '')
-				{
-					$this->addFormError($plainPasswordField,$errorMsg);
+				$errorMsg = PasswordValidator::renderError($this->get('translator'), $this->get('phxSettings'), $plainPassword);
+				if ($errorMsg != '') {
+					$this->addFormError($plainPasswordField, $errorMsg);
 				}
 
 				// test le formulaire
-				if ($form->isSubmitted() && $form->isValid())
-				{
+				if ($form->isSubmitted() && $form->isValid()) {
 					$encoder = $this->get('security.password_encoder');
-					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount,$plainPassword));
+					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount, $plainPassword));
 
 					$manager = $this->getManager();
 					$manager->flush();
 
 					// logue l'utilisateur
-					$loginService->loginCatalogUser($learnerAccount,$plainPassword);
-					
+					$loginService->loginCatalogUser($learnerAccount, $plainPassword);
+
 					//$this->addFlash('success', "mot de passe redéfini");
 
 					// redirige sur le catalogue
 					$route = $tokenData['route'];
-					if ($route)
-					{
+					if ($route) {
 						$route = 'catalog_homepage';
 					}
 
 					$this->addFlash('success', $this->translate('new_password_defined'));
-					
+
 					return $this->redirectToRoute($route);
 				}
 			}
-		}
-		catch (\Exception $exp)
-		{
+		} catch (\Exception $exp) {
 			$error = $exp->getMessage();
 			$succes = false;
 		}
 
 		// affiche la vue pour définir le mot de passe
-		$parameters = array('token' => $token,'form' => $form->createView());
-		return $this->phxRender('catalog/pages/define_password.html.twig',$parameters);
+		$parameters = array('token' => $token, 'form' => $form->createView());
+		return $this->phxRender('catalog/pages/define_password.html.twig', $parameters);
 	}
-}
+}

src/Phoenix/Controller/LearningSpace/LoginController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Controller\LearningSpace;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -14,6 +15,7 @@ use Logipro\Phoenix\Form\CatalogType\CatalogDefinePasswordType;
 use Logipro\Phoenix\Entity\Account\Constraints\Password\PasswordValidator;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Logipro\Phoenix\Service\LoginService;
+use Symfony\Component\HttpFoundation\Response;
 
 class LoginController extends LearningSpaceController
 {
@@ -50,133 +52,140 @@ class LoginController extends LearningSpaceController
 
 	public function manageRecoverPassword(Request $request, EventDispatcherInterface $eventDispatcher)
 	{
-			// création du formulaire
-			$formBuilder = $this->createFormBuilder();
-			$formBuilder->add('username', TextType::class);
-			$form = $formBuilder->getForm();
-	
-			// Traitement du POST
-			if ($request->isMethod('POST'))
-			{
-				$form->handleRequest($request);
-	
-				if ($form->isSubmitted() && $form->isValid())
-				{
-					$email = $form->get('username')->getData();
-	
-					$manager = $this->getDoctrine()->getManager();
-					$repository = $manager->getRepository(LearnerAccount::class);
-	
+		// création du formulaire
+		$formBuilder = $this->createFormBuilder();
+		$formBuilder->add('username', TextType::class);
+		$form = $formBuilder->getForm();
+
+		// Traitement du POST
+		if ($request->isMethod('POST')) {
+			$form->handleRequest($request);
+
+			if ($form->isSubmitted() && $form->isValid()) {
+				$email = $form->get('username')->getData();
+
+				$manager = $this->getDoctrine()->getManager();
+				$repository = $manager->getRepository(LearnerAccount::class);
+
+				try {
 					$learnerAccount = $repository->loadUserByUsername($email);
-					if ($learnerAccount)
-					{
-						//On déclenche l'event si l'adresse email est précisée
-						if ($learnerAccount->getEmail() != "")
-						{
-							$event = new GenericEvent($learnerAccount);
-							$eventDispatcher->dispatch($event,Events::LEARNER_RECOVER_PASSWORD);
-		
-							$this->addFlash('success', $this->get('translator')->trans('ls__success_password_recovery_email_sent'));
-						}
-						// sinon on invite l'utilisateur à contacter le support
-						else
-						{
-							$this->addFlash('success', $this->get('translator')->trans('ls__success_password_recovery_email_not_send'));
-						}
+				} catch (\Exception $exp) {
+
+					$response = new Response('', 409);
+
+					// token expiré
+					$parameters = array(
+						'text' => $exp->getMessage(),
+						'path' => 'ls_password_recover',
+						'go' => $this->translate('catalog_form_catalog_password_title')
+					);
+					return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters, $response);
+				}
+
+				if ($learnerAccount) {
+					//On déclenche l'event si l'adresse email est précisée
+					if ($learnerAccount->getEmail() != "") {
+						$event = new GenericEvent($learnerAccount);
+						$eventDispatcher->dispatch($event, Events::LEARNER_RECOVER_PASSWORD);
+
+						$this->addFlash('success', $this->get('translator')->trans('ls__success_password_recovery_email_sent'));
 					}
-					else
-					{
-						$this->addFlash('warning', $this->get('translator')->trans('ls__warning_user_not_seem_exist'));
+					// sinon on invite l'utilisateur à contacter le support
+					else {
+						$this->addFlash('error', $this->get('translator')->trans('ls__success_password_recovery_email_not_send'));
 					}
+				} else {
+					$this->addFlash('warning', $this->get('translator')->trans('ls__warning_user_not_seem_exist'));
 				}
-	
-				// Redirection pour vider le POST
-				return $this->redirectToRoute('ls_password_recover');
 			}
-	
-			$variables = array(
-				'form' => $form->createView(),
-			);
-	
-			return $this->phxRender('learning_space/pages/password/password-recover.html.twig', $variables);
+
+			// Redirection pour vider le POST
+			return $this->redirectToRoute('ls_password_recover');
+		}
+
+		$variables = array(
+			'form' => $form->createView(),
+		);
+
+		return $this->phxRender('learning_space/pages/password/password-recover.html.twig', $variables);
 	}
 
 
-	public function manageDefinePassword(Request $request,LoginService $loginService)
+	public function manageDefinePassword(Request $request, LoginService $loginService)
 	{
-		if ($this->getUser())
-		{
+		if ($this->getUser()) {
 			throw $this->createErrorException($this->translate('error_recover_password_logged'));
 		}
 		$token = $request->get('token');
 
-		$tokenData = PasswordRecoverNotifyLearner::decrytUrlArg($token);
-		if (!$tokenData)
-		{
+		if (!$token) {
 			throw $this->createNotFoundException($this->translate('error_403_message'));
 		}
 
+		$tokenData = PasswordRecoverNotifyLearner::decrytUrlArg($token);
+		if (!$tokenData) {
+			$response = new Response('', 404);
+			// token expiré
+			$parameters = array(
+				'text' => $this->translate('ls_password_expired'),
+				'path' => 'ls_homepage',
+				'go' => $this->translate('ls_password_return')
+			);
+			return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters, $response);
+		}
+
 		$respository = $this->getRepository(LearnerAccount::class);
 		$learnerAccount = $respository->findOneBy(array('learnerAccountId' => $tokenData['learnerAccountId']));
-		if (!$learnerAccount)
-		{
+		if (!$learnerAccount) {
 			throw $this->createNotFoundException($this->translate('error_403_message'));
 		}
-		$form = $this->createForm(CatalogDefinePasswordType::class,$learnerAccount); 
+		$form = $this->createForm(CatalogDefinePasswordType::class, $learnerAccount);
 
-		try
-		{
-			if ($request->isMethod('POST'))
-			{
+		try {
+			if ($request->isMethod('POST')) {
 				$form->handleRequest($request);
 
 				// test le mot de passe
 				$plainPasswordField = $form->get('plainPassword')->get('first');
 				$plainPassword = $plainPasswordField->getData();
-				$errorMsg = PasswordValidator::renderError($this->get('translator'),$this->get('phxSettings'),$plainPassword);
-				if ($errorMsg != '')
-				{
-					$this->addFormError($plainPasswordField,$errorMsg);
+				$errorMsg = PasswordValidator::renderError($this->get('translator'), $this->get('phxSettings'), $plainPassword);
+				if ($errorMsg != '') {
+					$this->addFormError($plainPasswordField, $errorMsg);
 				}
 
 				// test le formulaire
-				if ($form->isSubmitted() && $form->isValid())
-				{
+				if ($form->isSubmitted() && $form->isValid()) {
 					$oldPassword = $learnerAccount->getPassword();
 					$encoder = $this->get('security.password_encoder');
-					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount,$plainPassword));
+					$learnerAccount->setPassword($encoder->encodePassword($learnerAccount, $plainPassword));
 
 					$manager = $this->getManager();
 					$manager->flush();
 
 					if ($oldPassword == '') {
 						$this->addFlash('success', $this->translate('password_defined'));
-					}
-					else {
-						$this->addFlash('success',$this->translate('new_password_defined'));
+					} else {
+						$this->addFlash('success', $this->translate('new_password_defined'));
 					}
 
 					// logue l'utilisateur
-                    $loginService->loginLearningSpaceUser($learnerAccount,$plainPassword);
+					$loginService->loginLearningSpaceUser($learnerAccount, $plainPassword);
 
 					// redirige sur le catalogue
 					$route = $tokenData['route'];
-					if ($route == "")
-					{
+					if ($route == "") {
 						$route = 'ls_homepage';
 					}
 					return $this->redirectToRoute($route);
 				}
 			}
-		}
-		catch (\Exception $exp)
-		{
+		} catch (\Exception $exp) {
 			$error = $exp->getMessage();
 			$succes = false;
 		}
 
 		// affiche la vue pour définir le mot de passe
-		$parameters = array('token' => $token,'form' => $form->createView(), 'learnerAccount' => $learnerAccount);
-		return $this->phxRender('learning_space/pages/password/define_password.html.twig',$parameters);
+		$parameters = array('token' => $token, 'form' => $form->createView(), 'learnerAccount' => $learnerAccount);
+		return $this->phxRender('learning_space/pages/password/define_password.html.twig', $parameters);
 	}
-}
+}

src/Phoenix/Controller/NewBackOffice/Admin/LoginController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Controller\NewBackOffice\Admin;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -17,6 +18,7 @@ use Logipro\Phoenix\Entity\Account\LearnerAccount;
 use Symfony\Component\Security\Http\Firewall\ContextListener;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Logipro\Phoenix\Service\LoginService;
+use Symfony\Component\HttpFoundation\Response;
 
 class LoginController extends BackOfficeAdminController
 {
@@ -46,7 +48,7 @@ class LoginController extends BackOfficeAdminController
             'last_username' => $lastUsername,
             'error'         => $error,
             'site_name'     => $siteName,
-            'site_logo_path'=> $siteLogoPath,
+            'site_logo_path' => $siteLogoPath,
         ));
     }
 
@@ -60,7 +62,7 @@ class LoginController extends BackOfficeAdminController
         if ($this->getUser()) {
             throw $this->createNotFoundException($this->translate('error_403_message'));
         }
-        
+
         // Formulaire
         $formBuilder = $this->createFormBuilder();
         $formBuilder->add('email', EmailType::class);
@@ -80,7 +82,7 @@ class LoginController extends BackOfficeAdminController
                 if ($user) {
                     //On déclenche l'event
                     $event = new GenericEvent($user);
-                    $eventDispatcher->dispatch($event,Events::USER_RECOVER_PASSWORD);
+                    $eventDispatcher->dispatch($event, Events::USER_RECOVER_PASSWORD);
 
                     $this->addFlash('success', $this->get('translator')->trans('success_password_recovery_email_sent'));
                 } else {
@@ -106,23 +108,33 @@ class LoginController extends BackOfficeAdminController
         $variables = array(
             'form' => $form->createView(),
             'site_name'     => $siteName,
-            'site_logo_path'=> $siteLogoPath,
+            'site_logo_path' => $siteLogoPath,
         );
 
         return $this->phxRender('back-office/pages/password/password-recover.html.twig', $variables);
     }
 
 
-    public function manageDefinePassword(Request $request,LoginService $loginService)
+    public function manageDefinePassword(Request $request, LoginService $loginService)
     {
         if ($this->getUser()) {
             throw $this->createNotFoundException($this->translate('error_403_message'));
         }
         $token = $request->get('token');
+        if (!$token) {
+            throw $this->createNotFoundException($this->translate('error_403_message'));
+        }
 
         $tokenData = PasswordRecoverNotifyUser::decrytUrlArg($token);
         if (!$tokenData) {
-            throw $this->createNotFoundException($this->translate('error_403_message'));
+            $response = new Response('', 404);
+            // token expiré
+            $parameters = array(
+                'text' => $this->translate('bo_password_expired'),
+                'path' => 'bo_homepage',
+                'go' => $this->translate('back_homepage')
+            );
+            return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters, $response);
         }
 
         $respository = $this->getRepository(User::class);
@@ -143,10 +155,10 @@ class LoginController extends BackOfficeAdminController
                 if ($errorMsg != '') {
                     $this->addFormError($plainPasswordField, $errorMsg);
                 }
-                
+
                 // test le formulaire
                 if ($form->isSubmitted() && $form->isValid()) {
-                    $old = $user->getPassword() ;
+                    $old = $user->getPassword();
                     $plainPassword = $form->get('plainPassword')->getData();
                     $encoder = $this->get('security.password_encoder');
                     $user->setPassword($encoder->encodePassword($user, $plainPassword));
@@ -167,11 +179,11 @@ class LoginController extends BackOfficeAdminController
                             'button_text' => false,
                         );
                     }
-                    
+
                     $this->addToastFlash('success', $parameters);
 
                     // logue l'utilisateur
-                    $loginService->loginBackOfficeUser($user,$plainPassword);
+                    $loginService->loginBackOfficeUser($user, $plainPassword);
 
                     $route = $tokenData['route'];
                     if ($route == "") {
@@ -206,7 +218,7 @@ class LoginController extends BackOfficeAdminController
             'form' => $form->createView(),
             'user' => $user,
             'site_name'     => $siteName,
-            'site_logo_path'=> $siteLogoPath,
+            'site_logo_path' => $siteLogoPath,
         );
         return $this->phxRender('back-office/pages/password/define_password.html.twig', $parameters);
     }

src/Phoenix/Controller/NewBackOffice/Admin/Settings/PreviewEmailController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Controller\NewBackOffice\Admin\Settings;
 
 use Symfony\Component\HttpFoundation\Response;
@@ -14,7 +15,7 @@ class PreviewEmailController extends SettingsController
 	protected function createBreadcrumb()
 	{
 		$breadcrumb = parent::createBreadcrumb();
-		$breadcrumb->addItem('breadcrumb_settings',$this->generateUrl('nbo_settings'));
+		$breadcrumb->addItem('breadcrumb_settings', $this->generateUrl('nbo_settings'));
 
 		return $breadcrumb;
 	}
@@ -23,29 +24,29 @@ class PreviewEmailController extends SettingsController
 	 */
 	private function registerEmails()
 	{
-	// -- liste les emails disponible par espace
+		// -- liste les emails disponible par espace
 		// espace back office
 		$emailsBackOffice[] = $this->createEmailEntry(
 			'back_office/PasswordRecover.html.twig',
-			array('Identification',$this->translate('mail_password_recover_subject')),
+			array('Identification', $this->translate('mail_password_recover_subject')),
 			$this->translate('mail_password_recover_description'),
 			$this->translate('mail_destinary_user')
 		);
 		$emailsBackOffice[] = $this->createEmailEntry(
 			'back_office/AccessPlatform.html.twig',
-			array($this->translate('menu_settings'),$this->translate('title_user_accounts'),$this->translate('action_add_user')),
+			array($this->translate('menu_settings'), $this->translate('title_user_accounts'), $this->translate('action_add_user')),
 			$this->translate('mail_access_platform_subject_description'),
 			$this->translate('mail_destinary_user')
 		);
 		$emailsBackOffice[] = $this->createEmailEntry(
 			'back_office/InviteSession.html.twig',
-			array($this->translate('menu_follow_sessions'),$this->translate('action_explorer'),$this->translate('action_register_learner')),
+			array($this->translate('menu_follow_sessions'), $this->translate('action_explorer'), $this->translate('action_register_learner')),
 			$this->translate('mail_invite_session_subject_description'),
 			$this->translate('mail_destinary_learner')
 		);
 		$emailsBackOffice[] = $this->createEmailEntry(
 			'back_office/InviteSessionOpen.html.twig',
-			array($this->translate('menu_follow_sessions'),$this->translate('action_explorer'),$this->translate('action_register_learner')),
+			array($this->translate('menu_follow_sessions'), $this->translate('action_explorer'), $this->translate('action_register_learner')),
 			$this->translate('mail_invite_session_open_subject_description'),
 			$this->translate('mail_destinary_learner')
 		);
@@ -54,14 +55,14 @@ class PreviewEmailController extends SettingsController
 			array($this->translate('email_automatic')),
 			$this->translate('mail_verif_planning_session_subject_description'),
 			$this->translate('mail_destinary_user')
-		);		
+		);
 
 
 
 		// espace apprenant
 		$emailsLearningSpace[] = $this->createEmailEntry(
 			'learning_space/RecoverPassword.html.twig',
-			array('Identification',$this->translate('ls__mail_password_recover_subject',null,[],'recoverPassword')),
+			array('Identification', $this->translate('ls__mail_password_recover_subject', null, [], 'recoverPassword')),
 			$this->translate('ls__mail_password_recover_subject_description'),
 			$this->translate('mail_destinary_learner')
 		);
@@ -69,68 +70,67 @@ class PreviewEmailController extends SettingsController
 		// espace catalogue
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/RecoverPassword.html.twig',
-			array('Identification',$this->translate('catalog_form_catalog_password_title')),
+			array('Identification', $this->translate('catalog_form_catalog_password_title')),
 			$this->translate('ls__mail_create_account_description'),
 			$this->translate('mail_destinary_learner')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/LearnerAccountSubscribe.dpo.html.twig',
-			array('Connexion/inscription (popup)','Inscription'),
+			array('Connexion/inscription (popup)', 'Inscription'),
 			$this->translate('catalog_email_create_account_dpo_description'),
 			$this->translate('mail_destinary_dpo')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/LearnerAccountSubscribe.html.twig',
-			array('Connexion/inscription (popup)','Inscription'),
+			array('Connexion/inscription (popup)', 'Inscription'),
 			$this->translate('catalog_email_create_account_description'),
 			$this->translate('mail_destinary_learner')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/LearnerAccountSubscribe.to.html.twig',
-			array('Connexion/inscription (popup)','Inscription'),
+			array('Connexion/inscription (popup)', 'Inscription'),
 			$this->translate('catalog_email_create_account_to_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/AutomaticTrainingSubscribe.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_register_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_register_session')),
 			$this->translate('mail_automatic_training_subscribe_subject_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/ManualTrainingOrganizationResponse.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_register_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_register_session')),
 			$this->translate('mail_manual_training_organization_response_description'),
 			$this->translate('mail_destinary_learner')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/ManualTrainingSubscribe.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_register_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_register_session')),
 			$this->translate('mail_manual_training_subscribe_subject_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
-		
+
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/PaymentSessionFixedAutoAcceptance.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_payment_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_payment_session')),
 			$this->translate('mail_payment_session_fixed_auto_acceptance_subject_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/PaymentSessionFixedManualAcceptance.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_payment_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_payment_session')),
 			$this->translate('mail_payment_session_fixed_manual_acceptance_subject_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
 		$emailsCatalog[] = $this->createEmailEntry(
 			'catalog/PaymentSessionOpen.html.twig',
-			array($this->translate('title_catalog'),'formation',$this->translate('action_payment_session')),
+			array($this->translate('title_catalog'), 'formation', $this->translate('action_payment_session')),
 			$this->translate('mail_payment_session_open_subject_description'),
 			$this->translate('mail_destinary_training_organization')
 		);
-	
-		return array
-		(
+
+		return array(
 			'emails_back_office' => $emailsBackOffice,
 			'emails_catalogue' => $emailsCatalog,
 			'emails_learning_space' => $emailsLearningSpace
@@ -140,16 +140,16 @@ class PreviewEmailController extends SettingsController
 	/**
 	 * créé un email pour la liste twig
 	 */
-	private function createEmailEntry($filePath,$entry,$description,$destinary)
+	private function createEmailEntry($filePath, $entry, $description, $destinary)
 	{
 		$base64Path =  base64_encode($filePath);
 		return array(
 			'base64' => $base64Path,
-			'subject' => $this->renderB64Block($base64Path,'subject_layout'),
+			'subject' => $this->renderB64Block($base64Path, 'subject_layout'),
 			'destinary' => $destinary,
 			'description' => $description,
 			'url' => $this->generateUrl('nbo_draw_email', array('base64Path' => $base64Path)),
-			'entry' => implode(' > ',$entry)
+			'entry' => implode(' > ', $entry)
 		);
 	}
 
@@ -163,8 +163,8 @@ class PreviewEmailController extends SettingsController
 		$breadcrumb = $this->createBreadcrumb();
 		$breadcrumb->addActiveItem($this->translate('bo_param_email_list'));
 		$variables['breadcrumb'] = $breadcrumb;
-		
-		return $this->phxRender($this->viewPath . 'list/lists.html.twig',$variables);
+
+		return $this->phxRender($this->viewPath . 'list/lists.html.twig', $variables);
 	}
 
 	/**
@@ -177,12 +177,9 @@ class PreviewEmailController extends SettingsController
 
 		// recherche parmis les emails l'email correspondant
 		$emailsAllSpaces = $this->registerEmails();
-		foreach ($emailsAllSpaces as $emailsBySpace)
-		{
-			foreach ($emailsBySpace as $email)
-			{
-				if ($email['base64'] == $base64Path)
-				{
+		foreach ($emailsAllSpaces as $emailsBySpace) {
+			foreach ($emailsBySpace as $email) {
+				if ($email['base64'] == $base64Path) {
 					$subject = $email['subject'];
 					$description = $email['description'];
 					$entry = $email['entry'];
@@ -191,8 +188,7 @@ class PreviewEmailController extends SettingsController
 		}
 
 		// fichier non reconnu
-		if ($subject == "" &&  $description == "" && $entry == "")
-		{
+		if ($subject == "" &&  $description == "" && $entry == "") {
 			throw $this->createNotFoundException();
 		}
 
@@ -200,11 +196,10 @@ class PreviewEmailController extends SettingsController
 		$url = $this->generateUrl('nbo_draw_email_content', array('base64Path' => $base64Path));
 
 		$breadcrumb = $this->createBreadcrumb();
-		$breadcrumb->addRouteItem($this->translate('bo_param_email_list'),'nbo_draw_emails_list');
+		$breadcrumb->addRouteItem($this->translate('bo_param_email_list'), 'nbo_draw_emails_list');
 		$breadcrumb->addActiveItem($subject);
 
-		$variables = array
-		(
+		$variables = array(
 			'iframe_url' => $url,
 			'subject' => $subject,
 			'description' => $description,
@@ -213,15 +208,15 @@ class PreviewEmailController extends SettingsController
 			'main_menu_active' => self::MAIN_MENU_CREATE,
 			'secondary_menu_active' => self::SECONDARY_MENU_LEARNING_PATH,
 		);
-		return $this->phxRender($this->viewPath . 'email.html.twig',$variables);
+		return $this->phxRender($this->viewPath . 'email.html.twig', $variables);
 	}
 
 	/**
 	 * Affiche le contenu d'un email
 	 */
-	public function drawContent(string $base64Path,Request $request)
+	public function drawContent(string $base64Path, Request $request)
 	{
-		$block = $this->renderB64Block($base64Path,'message_layout');
+		$block = $this->renderB64Block($base64Path, 'message_layout');
 
 		return new Response($block);
 	}
@@ -234,10 +229,10 @@ class PreviewEmailController extends SettingsController
 	 * 
 	 * @eturn string
 	 */
-	protected function renderB64Block($base64Path,$blockName)
+	protected function renderB64Block($base64Path, $blockName)
 	{
 		$path = \base64_decode($base64Path);
-		
+
 		$settingService = $this->get('phxSettings');
 
 		$session = new SessionFixed();
@@ -255,8 +250,7 @@ class PreviewEmailController extends SettingsController
 		$rootPath = realpath($this->get('kernel')->getRootDir() . '/../../../') . '/';
 
 		$emailTemplatePath = $rootPath . 'templates/emails/' . $path;
-		if (!is_file($emailTemplatePath))
-		{
+		if (!is_file($emailTemplatePath)) {
 			return '';
 		}
 
@@ -267,102 +261,97 @@ class PreviewEmailController extends SettingsController
 			'#{%((?!%}).)*%}|{{((?!}}).)*}}#s',
 		);
 
-		foreach ($patterns as $pattern)
-		{
-			$content = preg_replace_callback($pattern,function($matches)
-			{	
-				$needle = $matches[0];
+		foreach ($patterns as $pattern) {
+			$content = preg_replace_callback(
+				$pattern,
+				function ($matches) {
+					$needle = $matches[0];
 
-				if (is_null($this->previousNeedle)) {
-					$this->previousNeedle = $needle;
-				}
+					if (is_null($this->previousNeedle)) {
+						$this->previousNeedle = $needle;
+					}
 
-				// Cas particulier pour les sujets qui doivent etre interprété
-				/*$search = array('block[\s]{0,}subject');
+					// Cas particulier pour les sujets qui doivent etre interprété
+					/*$search = array('block[\s]{0,}subject');
 				if (preg_match('#' . implode('|',$search) . '#',$this->previousNeedle))
 				{
 					$this->previousNeedle = $needle;
 					return $needle;
 				}*/
 
-				// tag de suppression
-				
-				$search = array('[^a-z]set');
-				if (preg_match('#' . implode('|',$search) . '#',$needle))
-				{
-					$this->previousNeedle = $needle;
-					return '';
-				}
-				// tag de commencement
-				$search = array('extends','block','embed');
-				if (preg_match('#' . implode('|',$search) . '#',$needle))
-				{
-					$this->previousNeedle = $needle;
-					return $needle;
-				}
+					// tag de suppression
+
+					$search = array('[^a-z]set');
+					if (preg_match('#' . implode('|', $search) . '#', $needle)) {
+						$this->previousNeedle = $needle;
+						return '';
+					}
+					// tag de commencement
+					$search = array('extends', 'block', 'embed');
+					if (preg_match('#' . implode('|', $search) . '#', $needle)) {
+						$this->previousNeedle = $needle;
+						return $needle;
+					}
+
+					// tag de commentaire
+					$search = array('{\#', '\#}');
+					if (preg_match('#' . implode('|', $search) . '#', $needle)) {
+						$this->previousNeedle = $needle;
+						return $needle;
+					}
+
+					// tag de fin
+					$search = array('endblock', 'endembed');
+					if (preg_match('#' . implode('|', $search) . '#', $needle)) {
+						$this->previousNeedle = $needle;
+						return $needle;
+					}
+
+					// autre : tranductions etc...
+					$search = array(
+						// traductions trans
+						'{{[\s]{0,}["|\'][a-zA-Z_]+["|\'][\s]{0,}\|[\s]{0,}trans'
+					);
+
+					if (preg_match('#' . implode('|', $search) . '#', $needle)) {
+						$needle = preg_replace('#trans\((.*),{0,}["|\']([a-zA-Z_]+)["|\'][\s]{0,}#', 'trans({\'%backline%\':\'<br/>\'},"$2"', $needle);
+						return $needle;
+					}
 
-				// tag de commentaire
-				$search = array('{\#','\#}');
-				if (preg_match('#' . implode('|',$search) . '#',$needle))
-				{
-					$this->previousNeedle = $needle;
-					return $needle;
-				}
-				
-				// tag de fin
-				$search = array('endblock','endembed');
-				if (preg_match('#' . implode('|',$search) . '#',$needle))
-				{
 					$this->previousNeedle = $needle;
-					return $needle;
-				}
 
-				// autre : tranductions etc...
-				$search = array(
-					// traductions trans
-					'{{[\s]{0,}["|\'][a-zA-Z_]+["|\'][\s]{0,}\|[\s]{0,}trans'
-				);
-				
-				if (preg_match('#' . implode('|',$search) . '#',$needle))
-				{
-					$needle = preg_replace('#trans\((.*),{0,}["|\']([a-zA-Z_]+)["|\'][\s]{0,}#','trans({\'%backline%\':\'<br/>\'},"$2"',$needle);
-					return $needle;
-				}
-
-				$this->previousNeedle = $needle;
-
-				return '{% verbatim %}' . $needle . '{% endverbatim %}';
-			},
-			$content);
+					return '{% verbatim %}' . $needle . '{% endverbatim %}';
+				},
+				$content
+			);
 		}
 
 		// créé un fichier temp
 		$tmpAbsoluteDir = $rootPath . 'templates/';
-		
+
 		$name = uniqid();
 		$tmpRelativePath = 'temp/' . $name;
-		
+
 
 		$newPath = $tmpAbsoluteDir . $tmpRelativePath;
-		\file_put_contents($newPath,$content);
+		$this->file_force_contents($newPath, $content);
 
-		$block = $this->renderBlockView($blockName,$tmpRelativePath,$variables);
+		$block = $this->renderBlockView($blockName, $tmpRelativePath, $variables);
 
 		// supprime le fichier temp
 		unlink($newPath);
-		
-		return $block;
 
+		return $block;
 	}
 
 	/**
-     * étend les variables pour tous les rendus de la classe
-     * à surcharger pour chacun des espaces
-     */
+	 * étend les variables pour tous les rendus de la classe
+	 * à surcharger pour chacun des espaces
+	 */
 	protected function extendsRenderVars(&$parameters)
 	{
 		parent::extendsRenderVars($parameters);
 
 		$parameters['main_menu_active'] = self::MAIN_MENU_SETTINGS;
 	}
-}
+}

src/Phoenix/Repository/LearningSpace/LearnerAccountRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Repository\LearningSpace;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -25,43 +26,39 @@ class LearnerAccountRepository extends ServiceEntityRepository implements UserLo
 	}
 
 	public function loadUserByUsername($username)
-    {
+	{
 		// recherche l'utilisateur par identifiant
 		$query = $this->createQueryBuilder('u')
-		->where('u.username = :username')
-		->setParameter('username', $username)
-		->getQuery();
+			->where('u.username = :username')
+			->setParameter('username', $username)
+			->getQuery();
 
 		// si 1 seul utilisateur trouvé => on le retourne
 		// si aucun ou plusieur, on regarde l'email
 		$users = $query->execute();
-		if ($users)
-		{
+		if ($users) {
 			// multi utilisateur = erreur
-			if (count($users) == 1)
-			{
+			if (count($users) == 1) {
 				return reset($users);
 			}
 		}
 
 		// recherche l'utilisateur par email
- 		$query = $this->createQueryBuilder('u')
-		->where('u.email = :email')
-		->setParameter('email', $username)
-		->getQuery();
+		$query = $this->createQueryBuilder('u')
+			->where('u.email = :email')
+			->setParameter('email', $username)
+			->getQuery();
 
 		$users = $query->execute();
-		if (!$users)
-		{
+		if (!$users) {
 			return null;
 		}
 
 		// multi utilisateur = erreur
-		if (count($users) > 1)
-		{
-            throw new \Exception('Cette adresse email correspond à plusieurs utilisateurs, veuillez saisir votre identifiant.');
+		if (count($users) > 1) {
+			throw new \Exception('Cette adresse email correspond à plusieurs utilisateurs, veuillez saisir votre identifiant.');
 		}
 
 		return reset($users);
-    }
+	}
 }

src/Phoenix/Service/Monitoring/MonitoringExportHandler.php

@@ -547,7 +547,7 @@ class MonitoringExportHandler
         $learner = $data['learner'];
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_sessions_list', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:H1');
+        )))->mergeCells('A1:I1');
 
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
@@ -560,6 +560,7 @@ class MonitoringExportHandler
             $this->translator->trans('column_monitoring_session_learner_completion'),
             $this->translator->trans('column_monitoring_session_learner_time'),
             $this->translator->trans('column_monitoring_session_learner_score'),
+            $this->translator->trans('column_monitoring_session_learner_first_activity'),
             $this->translator->trans('column_monitoring_session_learner_last_activity')
         ];
         $columnLetter = 'A';
@@ -572,8 +573,8 @@ class MonitoringExportHandler
         }
 
 
-        $sheet->getStyle('A3:H3')->applyFromArray($this->exportHandler->getStyleHeader());
-        $sheet->getStyle('A3:H3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setRGB('000000');
+        $sheet->getStyle('A3:I3')->applyFromArray($this->exportHandler->getStyleHeader());
+        $sheet->getStyle('A3:I3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setRGB('000000');
 
         $columnValues = array();
         foreach ($data['sessions'] as $session) {
@@ -589,6 +590,7 @@ class MonitoringExportHandler
                 $this->exportHandler->formatPercentToExport($sessionData['completion']),
                 $this->exportHandler->formatDurationToExport($sessionData['time']),
                 $this->exportHandler->formatPercentToExport($sessionData['averageScore']),
+                $this->exportHandler->formatDateToExport($sessionData['firstConnexion']),
                 $this->exportHandler->formatDateToExport($sessionData['lastConnexion'])
             );
 
@@ -660,14 +662,14 @@ class MonitoringExportHandler
         // Cellules informative
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_activities_list', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
 
 
         $sheet->setCellValue('A2', $this->translator->trans($i18nTitle, array(
             '%sessionTitle%' => $session->getTitle(),
             '%startDate%' => $datesSession['startDate'],
             '%endDate%' => $datesSession['endDate']
-        )))->mergeCells('A2:E2');
+        )))->mergeCells('A2:F2');
 
         // Formatage des Cellules
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
@@ -680,6 +682,7 @@ class MonitoringExportHandler
             $this->translator->trans('column_monitoring_session_learner_completion'),
             $this->translator->trans('column_monitoring_session_learner_time'),
             $this->translator->trans('column_monitoring_session_learner_score'),
+            $this->translator->trans('column_monitoring_session_learner_first_activity'),
             $this->translator->trans('column_monitoring_session_learner_last_activity')
         ];
         $columnLetter = 'A';
@@ -691,8 +694,8 @@ class MonitoringExportHandler
             $columnLetter++;
         }
 
-        $sheet->getStyle('A3:E3')->applyFromArray($this->exportHandler->getStyleHeader());
-        $sheet->getStyle('A3:E3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setRGB('000000');
+        $sheet->getStyle('A3:F3')->applyFromArray($this->exportHandler->getStyleHeader());
+        $sheet->getStyle('A3:F3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setRGB('000000');
 
         $columnValues = array();
         foreach ($data['activities'] as $activity) {
@@ -703,6 +706,7 @@ class MonitoringExportHandler
                 $this->exportHandler->formatPercentToExport($activityData['completion']),
                 $this->exportHandler->formatDurationToExport($activityData['time']),
                 $this->exportHandler->formatPercentToExport($activityData['averageScore']),
+                $this->exportHandler->formatDateToExport($activityData['firstConnexion']),
                 $this->exportHandler->formatDateToExport($activityData['lastConnexion'])
             );
 
@@ -1032,7 +1036,7 @@ class MonitoringExportHandler
             '%sessionTitle%' => $session->getTitle(),
             '%startDate%' => $datesSession['startDate'],
             '%endDate%' => $datesSession['endDate']
-        )))->mergeCells('A1:G1');
+        )))->mergeCells('A1:H1');
 
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
@@ -1045,6 +1049,7 @@ class MonitoringExportHandler
             $this->translator->trans('column_monitoring_session_learner_completion'),
             $this->translator->trans('column_monitoring_session_learner_time'),
             $this->translator->trans('column_monitoring_session_learner_score'),
+            $this->translator->trans('column_monitoring_session_learner_first_activity'),
             $this->translator->trans('column_monitoring_session_learner_last_activity')
         ];
         $columnLetter = 'A';
@@ -1057,8 +1062,8 @@ class MonitoringExportHandler
         }
 
 
-        $sheet->getStyle('A3:G3')->applyFromArray($this->exportHandler->getStyleHeader());
-        $sheet->getStyle('A3:G3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
+        $sheet->getStyle('A3:H3')->applyFromArray($this->exportHandler->getStyleHeader());
+        $sheet->getStyle('A3:H3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
 
         $columnValues = array();
         foreach ($data['learners'] as $learner) {
@@ -1073,6 +1078,7 @@ class MonitoringExportHandler
                 $this->exportHandler->formatPercentToExport($learnerData['completion']),
                 $this->exportHandler->formatDurationToExport($learnerData['time']),
                 $this->exportHandler->formatPercentToExport($learnerData['averageScore']),
+                $this->exportHandler->formatDateToExport($learnerData['firstConnexion']),
                 $this->exportHandler->formatDateToExport($learnerData['lastConnexion'])
             );
 
@@ -1133,7 +1139,7 @@ class MonitoringExportHandler
 
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_activity', array(
             '%activityTitle%' => $activity->getTitle()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
 
@@ -1143,6 +1149,7 @@ class MonitoringExportHandler
             $this->translator->trans('column_monitoring_session_learner_completion'),
             $this->translator->trans('column_monitoring_session_learner_time'),
             $this->translator->trans('column_monitoring_session_learner_score'),
+            $this->translator->trans('column_monitoring_session_learner_first_activity'),
             $this->translator->trans('column_monitoring_session_learner_last_activity')
         ];
         $columnLetter = 'A';
@@ -1155,8 +1162,8 @@ class MonitoringExportHandler
         }
 
 
-        $sheet->getStyle('A3:E3')->applyFromArray($this->exportHandler->getStyleHeader());
-        $sheet->getStyle('A3:E3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
+        $sheet->getStyle('A3:F3')->applyFromArray($this->exportHandler->getStyleHeader());
+        $sheet->getStyle('A3:F3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
 
         $columnValues = array();
         foreach ($data['learners'] as $learner) {
@@ -1169,6 +1176,7 @@ class MonitoringExportHandler
                 $this->exportHandler->formatPercentToExport($learnerData['completion']),
                 $this->exportHandler->formatDurationToExport($learnerData['time']),
                 $this->exportHandler->formatPercentToExport($learnerData['averageScore']),
+                $this->exportHandler->formatDateToExport($learnerData['firstConnexion']),
                 $this->exportHandler->formatDateToExport($learnerData['lastConnexion'])
             );
 
@@ -1257,7 +1265,7 @@ class MonitoringExportHandler
 
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
 
@@ -1267,6 +1275,7 @@ class MonitoringExportHandler
             $this->translator->trans('column_monitoring_session_learner_completion'),
             $this->translator->trans('column_monitoring_session_learner_time'),
             $this->translator->trans('column_monitoring_session_learner_score'),
+            $this->translator->trans('column_monitoring_session_learner_first_activity'),
             $this->translator->trans('column_monitoring_session_learner_last_activity')
         ];
         $columnLetter = 'A';
@@ -1279,8 +1288,8 @@ class MonitoringExportHandler
         }
 
 
-        $sheet->getStyle('A3:E3')->applyFromArray($this->exportHandler->getStyleHeader());
-        $sheet->getStyle('A3:E3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
+        $sheet->getStyle('A3:F3')->applyFromArray($this->exportHandler->getStyleHeader());
+        $sheet->getStyle('A3:F3')->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF000000');
 
         $columnValues = array();
         foreach ($data['activities'] as $activity) {
@@ -1293,6 +1302,7 @@ class MonitoringExportHandler
                 $this->exportHandler->formatPercentToExport($activityData['completion']),
                 $this->exportHandler->formatDurationToExport($activityData['time']),
                 $this->exportHandler->formatPercentToExport($activityData['averageScore']),
+                $this->exportHandler->formatDateToExport($activityData['firstConnexion']),
                 $this->exportHandler->formatDateToExport($activityData['lastConnexion'])
             );
 

templates/back-office/admin/monitoring/sessions/single/learner/single_learner.html.twig

@@ -15,7 +15,7 @@
 			{# / breadcrumb #}
 			{# Action supplementaire (...) #}
 			<div class="ali-ContentNavAction col-md-7 col-xl-5">
-                <a href="{{ path('nbo_os_sessions_monitoring_export_global', { 'sessionId': session.sessionId }) }}" class="btn btn-primary">
+                <a href="{{ path('nbo_sessions_monitoring_export_global', { 'sessionId': session.sessionId }) }}" class="btn btn-primary">
                 	<i class="icons">import_export</i>
                 	<span class="ali-ContentNavAction-libBtn">{{ 'action_global_export'|trans }}</span>
                 </a>		

templates/bundles/TwigBundle/Exception/definePassword.html.twig

@@ -0,0 +1,7 @@
+{% extends "bundles/TwigBundle/Exception/error404.html.twig" %}
+{% block content %}
+    <p class="h3">{{ text }}</p>
+    <p class="">
+        <a href="{{ path(path) }}">{{ go }}</a>
+    </p>
+{% endblock %}

templates/bundles/TwigBundle/Exception/error404.html.twig

@@ -13,15 +13,16 @@
 			
 			<h2 class="h5 text-muted">{{ 'error_404_message'|trans }}</h2>
 			
-			{% set text = exception.message %}
-			{% if text == '' %}
-				{% set text = 'error_404_funny_text'|trans %}
-			{% endif %}
-			<p class="h3">{{ text }}</p>
+			{% block content %}
+				{% set text = exception.message %}
+				{% if text != '' %}
+					<p class="h3">{{ text }}</p>
+				{% endif %}
 
-			<p class="">
-				<a href="{{ path('bo_homepage') }}">{{ 'action_go_back_home'|trans }}</a>
-			</p>
+				<p class="">
+					<a href="{{ path('bo_homepage') }}">{{ 'action_go_back_home'|trans }}</a>
+				</p>
+			{% endblock %}
 			
 			<img alt="Image" src="{{ asset('build/images/learning-path.png') }}" class="w-100"/>
 			

tests/Phoenix/Component/ExpiredPhxCrypt.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Logipro\Phoenix\tests\Phoenix\Component;
+
+use Logipro\Phoenix\Component\PhxCrypt;
+
+class ExpiredPhxCrypt extends PhxCrypt
+{
+    protected static function serialize(array $data):string
+    {
+        $data['_d_'] = 0;
+        return parent::serialize($data);
+    }
+}

tests/Phoenix/Controller/LearningSpace/LoginControllerTest.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Logipro\Phoenix\tests\Phoenix\Controller\NewBackOffice\Session\Follow;
+
+use Logipro\Phoenix\Component\PhxCrypt;
+use Logipro\Phoenix\tests\Phoenix\Component\ExpiredPhxCrypt;
+use Logipro\Phoenix\tests\PhxWebTestCase;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+
+class LoginControllerTest extends PhxWebTestCase
+{
+    /*
+    sera développé quand les fatory seront présents
+    public function testManageDefinePasswordWithUser()
+    { }*/
+
+    public function testManageDefinePasswordWithoutToken()
+    {
+        $client = static::createClient();
+
+        $params = array();
+        $crawler = $client->request(
+            'GET',
+            $this->getRoutePath('ls_password_define'),
+            $params
+        );
+
+        $this->assertSame(404, $client->getResponse()->getStatusCode());
+    }
+    public function testManageDefinePasswordWithEmptyToken()
+    {
+        $client = static::createClient();
+
+        $params = array(
+            'token' =>  ''
+        );
+        $crawler = $client->request(
+            'GET',
+            $this->getRoutePath('ls_password_define'),
+            $params
+        );
+
+        $this->assertSame(404, $client->getResponse()->getStatusCode());
+    }
+
+    public function testManageDefinePasswordWithoutLearner()
+    {
+        $client = static::createClient();
+
+        $params = array(
+            'token' =>  PhxCrypt::crypt(array(
+                'learnerAccountId' => 0,
+                'route' => 'ls_homepage'
+            ))
+        );
+        $crawler = $client->request(
+            'GET',
+            $this->getRoutePath('ls_password_define'),
+            $params
+        );
+
+        $this->assertSame(404, $client->getResponse()->getStatusCode());
+    }
+
+    public function testManageDefinePasswordWithExpiredToken()
+    {
+        $client = static::createClient();
+
+        $params = array(
+            'token' =>  ExpiredPhxCrypt::crypt(array(
+                'learnerAccountId' => 0,
+                'route' => 'ls_homepage'
+            ))
+        );
+        $crawler = $client->request(
+            'GET',
+            $this->getRoutePath('ls_password_define'),
+            $params
+        );
+
+        $this->assertSame(404, $client->getResponse()->getStatusCode());
+    }
+
+    /*
+    // A TERMINER IL Y A UN PB AVEC L'AUTHENTIFCATION
+    public function testList()
+    {
+        $client = static::createClient();
+
+        $crawler = $client->request(
+            'GET',
+            '/follow/sessions'
+        );
+
+        $this->assertSame(200, $client->getResponse()->getStatusCode());
+    }
+    */
+}

tests/Phoenix/Controller/NewBackOffice/Session/Follow/SessionFixedControllerTest.php

@@ -1,11 +1,12 @@
 <?php
-namespace Logipro\Phoenix\Tests\Controller\NewBackOffice\Session\Follow;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+namespace Logipro\Phoenix\tests\Phoenix\Controller\NewBackOffice\Session\Follow;
 
+use Logipro\Phoenix\tests\PhxWebTestCase;
 
-class SessionFiexedControllerTest extends WebTestCase
-{  
+
+class SessionFiexedControllerTest extends PhxWebTestCase
+{
 
     /*
     // A TERMINER IL Y A UN PB AVEC L'AUTHENTIFCATION
@@ -20,5 +21,4 @@ class SessionFiexedControllerTest extends WebTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
     }
-    */   
-}
+    */ }

tests/Phoenix/Service/Comment/CommentHandlerTest.php

@@ -1,5 +1,6 @@
 <?php
-namespace Logipro\Phoenix\Tests\Service\Comment;
+
+namespace Logipro\Phoenix\tests\Phoenix\Service\Comment;
 
 use PHPUnit\Framework\TestCase;
 use Logipro\Phoenix\Entity\Comment;
@@ -16,26 +17,28 @@ use Twig\Environment;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
 
+use Logipro\Phoenix\Service\Session\SessionHandler;
+
 class CommentHandlerTest extends TestCase
-{	
+{
 	private $comment;
 	private $session;
 	private $person;
 
 
-    private $entityManager;
+	private $entityManager;
 
-    public function setUp()
-    {
+	public function setUp()
+	{
 		$this->person = new Person();
 		$this->person->setGivenName('Laurent');
 
-        $this->session = new SessionOpen();
+		$this->session = new SessionOpen();
 		$this->session->setTitle('Test CommentHandlerTest');
 
 		$this->comment = new Comment($this->person);
 		$this->comment->setContent('Mon commentaire');
-		$this->comment->setSession($this->session);	
+		$this->comment->setSession($this->session);
 	}
 
 	/**
@@ -54,10 +57,11 @@ class CommentHandlerTest extends TestCase
 		$translator = $this->createMock(TranslatorInterface::class);
 		$templing = $this->createMock(Environment::class);
 		$security = $this->createMock(Security::class);
+		$sessionHandler = $this->createMock(SessionHandler::class);
 
-		$commentHandler = new CommentHandler($dispatcher,$entityManager,$translator,$templing,$security);
-		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');	
-	}		
+		$commentHandler = new CommentHandler($dispatcher, $entityManager, $translator, $templing, $security, $sessionHandler);
+		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');
+	}
 
 	/**
 	 * Test pour verifier que le mail nouveau commentaire ne soit pas envoyé si l'option notifyMailForum est à false
@@ -75,8 +79,10 @@ class CommentHandlerTest extends TestCase
 		$templing = $this->createMock(Environment::class);
 		$security = $this->createMock(Security::class);
 
-		$commentHandler = new CommentHandler($dispatcher,$entityManager,$translator,$templing,$security);
-		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');	
+		$sessionHandler = $this->createMock(SessionHandler::class);
+
+		$commentHandler = new CommentHandler($dispatcher, $entityManager, $translator, $templing, $security, $sessionHandler);
+		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');
 	}
 
 
@@ -96,9 +102,11 @@ class CommentHandlerTest extends TestCase
 		$templing = $this->createMock(Environment::class);
 		$security = $this->createMock(Security::class);
 
-		$commentHandler = new CommentHandler($dispatcher,$entityManager,$translator,$templing,$security);
-		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');	
-	}	
+		$sessionHandler = $this->createMock(SessionHandler::class);
+
+		$commentHandler = new CommentHandler($dispatcher, $entityManager, $translator, $templing, $security, $sessionHandler);
+		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');
+	}
 
 	/**
 	 * Test pour verifier que le mail nouveau commentaire ne soit pas envoyé si il n'y a pas de responsable pédagogique
@@ -116,7 +124,9 @@ class CommentHandlerTest extends TestCase
 		$templing = $this->createMock(Environment::class);
 		$security = $this->createMock(Security::class);
 
-		$commentHandler = new CommentHandler($dispatcher,$entityManager,$translator,$templing,$security);
-		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');	
-	}	
-}
+		$sessionHandler = $this->createMock(SessionHandler::class);
+
+		$commentHandler = new CommentHandler($dispatcher, $entityManager, $translator, $templing, $security, $sessionHandler);
+		$commentHandler->sendNotificationNewComment($this->comment, $this->session, 'session');
+	}
+}

tests/Phoenix/Service/FormHandlerTest.php

@@ -1,5 +1,6 @@
 <?php
-namespace Logipro\Phoenix\Tests\Service;
+
+namespace Logipro\Phoenix\tests\Phoenix\Service;
 
 use Symfony\Component\Form\Test\TypeTestCase;
 
@@ -12,35 +13,36 @@ use Symfony\Component\Form\FormError;
 use Logipro\Phoenix\Service\FormHandler;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\FormFactoryInterface;
 
 class FormHandlerTest extends TypeTestCase
 {
-	private function generateHandler(bool $isMethod = true) : FormHandler
+	private function generateHandler(bool $isMethod = true): FormHandler
 	{
 		$requestStackMock = $this->createMock(RequestStack::class);
-		
+
 		$request = $this->createMock(Request::class);
 		$request->method('isMethod')->willReturn($isMethod);
-		
+
 		$requestStackMock->method('getCurrentRequest')->willReturn($request);
-		
+
 		$trnaslatorMock = $this->createMock(TranslatorInterface::class);
-		
-		return new FormHandler($requestStackMock,$trnaslatorMock);
+		$factoryMock = $this->createMock(FormFactoryInterface::class);
 
+		return new FormHandler($requestStackMock, $trnaslatorMock, $factoryMock);
 	}
-    public function testGetFormFieldError()
-    {
+	public function testGetFormFieldError()
+	{
 		$handler = $this->generateHandler();
 
 		$form = $this->factory->createBuilder(FormType::class)
 			->add('task', TextType::class)
 			->getForm();
 
-		$newError = new FormError('','');
+		$newError = new FormError('', '');
 		$taskField = $form->get('task');
 		// soumettre le formulaire sinon la validation ne se fait pas
-		$form->submit(array('task' => 'Fabien'),false);
+		$form->submit(array('task' => 'Fabien'), false);
 		$taskField->addError($newError);
 
 		$errors = $handler->getFormFieldError($form);
@@ -57,7 +59,7 @@ class FormHandlerTest extends TypeTestCase
 			$form
 		);
 	}
-	
+
 	/**
 	 * @expectedException \Exception
 	 *
@@ -68,13 +70,13 @@ class FormHandlerTest extends TypeTestCase
 		$handler = $this->generateHandler();
 
 		$form = $this->factory->createBuilder(FormType::class)
-		->add('task', TextType::class)
-		->getForm();
+			->add('task', TextType::class)
+			->getForm();
 
-		$newError = new FormError('','');
+		$newError = new FormError('', '');
 		$taskField = $form->get('task');
 		// soumettre le formulaire sinon la validation ne se fait pas
-		$form->submit(array('task' => 'Fabien'),false);
+		$form->submit(array('task' => 'Fabien'), false);
 		$taskField->addError($newError);
 
 		$handler->validForm($form);
@@ -94,4 +96,4 @@ class FormHandlerTest extends TypeTestCase
 
 		$handler->validate($form);
 	}
-}
+}

tests/Phoenix/Tools/Tree/TreeWalkerTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Logipro\Phoenix\Tests\Tools\Tree;
+namespace Logipro\Phoenix\tests\Phoenix\Tools\Tree;
 
 use PHPUnit\Framework\TestCase;
 use Logipro\Phoenix\Tools\Tree\TreeNode;

tests/PhxWebTestCase.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Logipro\Phoenix\tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class PhxWebTestCase extends WebTestCase
+{
+    protected function getRoutePath(string $path): string
+    {
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
+        $route = $container->get('router')->getRouteCollection()->get($path);
+        if (!$route) {
+            throw new NotFoundHttpException();
+        }
+        return $route->getPath();
+    }
+}

translations/messages.fr.xlf

@@ -713,6 +713,11 @@
 				<target>Dernière connexion</target>
 			</trans-unit>
 
+			<trans-unit id="column_monitoring_session_learner_first_activity">
+				<source>column_monitoring_session_learner_first_activity</source>
+				<target>Première connexion</target>
+			</trans-unit>
+
 			<trans-unit id="column_monitoring_quiz_index">
 				<source>column_monitoring_quiz_index</source>
 				<target>#</target>
@@ -10084,6 +10089,28 @@ Un indicateur vous permettra de savoir si vous l'avez déjà envoyé à tel ou t
 				<source>clear_button</source>
         		<target>Effacer</target>
 			</trans-unit>
+
+			<trans-unit id="bo_password_expired">
+				<source>bo_password_expired</source>
+        		<target>Le lien pour définir votre mot de passe a expiré. Nous vous invitons à cliquer sur "Mot de passe perdu?" lors de votre prochaine connexion pour en définir un nouveau.</target>
+			</trans-unit>
+			<trans-unit id="ls_password_expired">
+				<source>ls_password_expired</source>
+        		<target>Le lien pour définir votre mot de passe a expiré. Nous vous invitons à cliquer sur "Mot de passe perdu?" lors de votre prochaine connexion à l'espace apprenant pour en définir un nouveau.</target>
+			</trans-unit>
+			<trans-unit id="catalog_password_expired">
+				<source>catalog_password_expired</source>
+        		<target>Le lien pour définir votre mot de passe a expiré. Nous vous invitons à cliquer sur "Mot de passe perdu?" lors de votre prochaine connexion au catalogue pour en définir un nouveau.</target>
+			</trans-unit>
+
+			<trans-unit id="ls_password_return">
+				<source>ls_password_return</source>
+        		<target>retourner sur l'espace apprenant</target>
+			</trans-unit>
+			<trans-unit id="catalog_password_return">
+				<source>catalog_password_return</source>
+        		<target>retourner sur le catalogue</target>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>