BGC-171 @fixed unit test

.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",

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/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,89 +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) {
-            // 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 = 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

@@ -118,15 +118,20 @@ class LoginController extends LearningSpaceController
 		}
 		$token = $request->get('token');
 
+		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);
+			return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters, $response);
 		}
 
 		$respository = $this->getRepository(LearnerAccount::class);

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

@@ -18,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
 {
@@ -120,16 +121,20 @@ class LoginController extends BackOfficeAdminController
             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) {
+            $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);
+            return $this->phxRender('bundles/TwigBundle/Exception/definePassword.html.twig', $parameters, $response);
         }
 
         $respository = $this->getRepository(User::class);

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,5 @@
 <?php
-namespace Logipro\Phoenix\Tests\Service\Comment;
+namespace Logipro\Phoenix\tests\Phoenix\Service\Comment;
 
 use PHPUnit\Framework\TestCase;
 use Logipro\Phoenix\Entity\Comment;

tests/Phoenix/Service/FormHandlerTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Logipro\Phoenix\Tests\Service;
+namespace Logipro\Phoenix\tests\Phoenix\Service;
 
 use Symfony\Component\Form\Test\TypeTestCase;
 

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