From 55f0051db2c401f9ccd34f1737a89dda8f039a24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Aug 2019 15:17:13 +0200
Subject: [PATCH 1/5] Html tag <marquee are forbidden

---
 htdocs/main.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 65464d724b1..575a88fbd28 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -108,6 +108,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
+	$inj += (stripos('/<marquee/i', $val) === false ? 0 : 1);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
 	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);

From 7942c5edf7f27382f2b8380a21a141e49153d12f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Aug 2019 16:22:24 +0200
Subject: [PATCH 2/5] Fix js injection

---
 htdocs/core/lib/functions.lib.php |  8 ++++++--
 htdocs/main.inc.php               | 17 +++++++++--------
 htdocs/user/group/card.php        |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30267a57ad5..5540feadd14 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -922,11 +922,15 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
  *  @param      string		$stringtoescape		String to escape
  *  @param		int			$keepb				1=Preserve b tags (otherwise, remove them)
  *  @param      int         $keepn              1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.
+ *  @param		string		$keepmoretags		'' or 'common' or list of tags
  *  @return     string     				 		Escaped string
  *  @see		dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent()
  */
-function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)
+function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '')
 {
+	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	// TODO Implement $keepmoretags
+
 	// escape quotes and backslashes, newlines, etc.
 	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
 	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
@@ -5528,7 +5532,7 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
 
 /**
  *	This function is called to encode a string into a HTML string but differs from htmlentities because
- * 	a detection is done before to see if text is already HTML or not. Also, all entities but &,<,> are converted.
+ * 	a detection is done before to see if text is already HTML or not. Also, all entities but &,<,>," are converted.
  *  This permits to encode special chars to entities with no double encoding for already encoded HTML strings.
  * 	This function also remove last EOL or BR if $removelasteolbr=1 (default).
  *  For PDF usage, you can show text by 2 ways:
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 575a88fbd28..a4f90c1660c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -108,17 +108,18 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
-	$inj += (stripos('/<marquee/i', $val) === false ? 0 : 1);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
 	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-	$inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-	$inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-	$inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
+	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val);        //
+	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val);        //
+	$inj += preg_match('/on(abort|afterprint[beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
+	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
+	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|submit|suspend)\s*=/i', $val);
+	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	//if ($type == 1)
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 25ee449b889..1610210e473 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 			} else {
 				$object->name	= trim(GETPOST("nom", 'nohtml'));
 				$object->nom	= $object->name;	// For backward compatibility
-				$object->note	= trim(GETPOST("note", 'none'));
+				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 
 			$object->name	= trim(GETPOST("group", 'nohtml'));
 			$object->nom	= $object->name;			// For backward compatibility
-			$object->note	= dol_htmlcleanlastbr(GETPOST("note", 'none'));
+			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);

From 5e7fc06ab2bad4db9747e01ffe16bd9f30d6954a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Aug 2019 16:25:25 +0200
Subject: [PATCH 3/5] Fix js injection

---
 htdocs/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a4f90c1660c..994026d051c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -118,7 +118,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/on(abort|afterprint[beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
 	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
 	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|submit|suspend)\s*=/i', $val);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'

From 58643e5e9694fc2d28f5ce152621a65dcaf35e8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Aug 2019 00:44:10 +0200
Subject: [PATCH 4/5] Fix regression

---
 htdocs/main.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 994026d051c..19517973882 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -115,7 +115,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val);        //
 	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val);        //
-	$inj += preg_match('/on(abort|afterprint[beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
+	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
 	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
 	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);

From 8938573f6838f9f850c1d8795132e670c3effac3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Aug 2019 00:47:12 +0200
Subject: [PATCH 5/5] Fix phpunit for last versions of phpunit

---
 test/phpunit/ActionCommTest.php            | 2 +-
 test/phpunit/AdherentTest.php              | 2 +-
 test/phpunit/AdminLibTest.php              | 2 +-
 test/phpunit/AllTests.php                  | 2 +-
 test/phpunit/BOMTest.php                   | 2 +-
 test/phpunit/BankAccountTest.php           | 2 +-
 test/phpunit/BonPrelevementTest.php        | 2 +-
 test/phpunit/BuildDocTest.php              | 2 +-
 test/phpunit/CMailFileTest.php             | 2 +-
 test/phpunit/CategorieTest.php             | 2 +-
 test/phpunit/ChargeSocialesTest.php        | 2 +-
 test/phpunit/CodingPhpTest.php             | 2 +-
 test/phpunit/CommandeFournisseurTest.php   | 2 +-
 test/phpunit/CommandeTest.php              | 2 +-
 test/phpunit/CommonObjectTest.php          | 2 +-
 test/phpunit/CompanyBankAccountTest.php    | 2 +-
 test/phpunit/CompanyLibTest.php            | 2 +-
 test/phpunit/ContactTest.php               | 2 +-
 test/phpunit/ContratTest.php               | 2 +-
 test/phpunit/CoreTest.php                  | 2 +-
 test/phpunit/DateLibTest.php               | 2 +-
 test/phpunit/DateLibTzFranceTest.php       | 2 +-
 test/phpunit/DiscountTest.php              | 2 +-
 test/phpunit/EntrepotTest.php              | 2 +-
 test/phpunit/ExpenseReportTest.php         | 2 +-
 test/phpunit/ExportTest.php                | 2 +-
 test/phpunit/FactureFournisseurTest.php    | 2 +-
 test/phpunit/FactureRecTest.php            | 2 +-
 test/phpunit/FactureTest.php               | 2 +-
 test/phpunit/FactureTestRounding.php       | 2 +-
 test/phpunit/FichinterTest.php             | 2 +-
 test/phpunit/FilesLibTest.php              | 2 +-
 test/phpunit/FormAdminTest.php             | 2 +-
 test/phpunit/Functions2LibTest.php         | 2 +-
 test/phpunit/ImagesLibTest.php             | 2 +-
 test/phpunit/ImportTest.php                | 2 +-
 test/phpunit/JsonLibTest.php               | 2 +-
 test/phpunit/LangTest.php                  | 2 +-
 test/phpunit/LoanTest.php                  | 2 +-
 test/phpunit/MarginsLibTest.php            | 2 +-
 test/phpunit/ModulesTest.php               | 2 +-
 test/phpunit/MouvementStockTest.php        | 2 +-
 test/phpunit/NumberingModulesTest.php      | 2 +-
 test/phpunit/PaypalTest.php                | 2 +-
 test/phpunit/PdfDocTest.php                | 2 +-
 test/phpunit/PgsqlTest.php                 | 2 +-
 test/phpunit/PricesTest.php                | 2 +-
 test/phpunit/ProductTest.php               | 2 +-
 test/phpunit/ProjectTest.php               | 2 +-
 test/phpunit/PropalTest.php                | 2 +-
 test/phpunit/RestAPIDocumentTest.php       | 2 +-
 test/phpunit/RestAPIUserTest.php           | 2 +-
 test/phpunit/ScriptsTest.php               | 2 +-
 test/phpunit/SecurityTest.php              | 2 +-
 test/phpunit/SocieteTest.php               | 2 +-
 test/phpunit/SupplierProposalTest.php      | 2 +-
 test/phpunit/TicketTest.php                | 2 +-
 test/phpunit/UserGroupTest.php             | 2 +-
 test/phpunit/UserTest.php                  | 2 +-
 test/phpunit/UtilsTest.php                 | 2 +-
 test/phpunit/WebservicesInvoicesTest.php   | 2 +-
 test/phpunit/WebservicesOrdersTest.php     | 2 +-
 test/phpunit/WebservicesOtherTest.php      | 2 +-
 test/phpunit/WebservicesProductsTest.php   | 2 +-
 test/phpunit/WebservicesThirdpartyTest.php | 2 +-
 test/phpunit/WebservicesUserTest.php       | 2 +-
 test/phpunit/XCalLibTest.php               | 2 +-
 67 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index f9c0928bad2..921d0e6d70d 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ActionCommTest extends PHPUnit_Framework_TestCase
+class ActionCommTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index bd5ae5571cc..c83df4da0d2 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class AdherentTest extends PHPUnit_Framework_TestCase
+class AdherentTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index bbf5ae2da00..21133d21072 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class AdminLibTest extends PHPUnit_Framework_TestCase
+class AdminLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index ee7ec9375d6..0f270ad032b 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -75,7 +75,7 @@ class AllTests
     public static function suite()
     {
 
-        $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
+        $suite = new PHPUnit\Framework\TestSuite('PHPUnit Framework');
 
         //require_once dirname(__FILE__).'/CoreTest.php';
         //$suite->addTestSuite('CoreTest');
diff --git a/test/phpunit/BOMTest.php b/test/phpunit/BOMTest.php
index ace04f7ba71..1179b35e6e1 100644
--- a/test/phpunit/BOMTest.php
+++ b/test/phpunit/BOMTest.php
@@ -28,7 +28,7 @@ namespace test\unit;
  * Class BillOfMaterialsTest
  * @package Testbillofmaterials
  */
-class BOMTest extends \PHPUnit_Framework_TestCase
+class BOMTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * Global test setup
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index fa150742c4b..94149bd0ad5 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -46,7 +46,7 @@ $langs->load("main");
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BankAccountTest extends PHPUnit_Framework_TestCase
+class BankAccountTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php
index 4ba05b2c0b6..d65d2066c2a 100644
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -47,7 +47,7 @@ $langs->load("main");
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BonPrelevementTest extends PHPUnit_Framework_TestCase
+class BonPrelevementTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index e8fa72a8f40..442b76091ff 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -74,7 +74,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BuildDocTest extends PHPUnit_Framework_TestCase
+class BuildDocTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index b664b345c26..9941eaa67da 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CMailFileTest extends PHPUnit_Framework_TestCase
+class CMailFileTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 80761a6e594..46d8dbe875b 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CategorieTest extends PHPUnit_Framework_TestCase
+class CategorieTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index b037e50752d..9eabbf20fa0 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ChargeSocialesTest extends PHPUnit_Framework_TestCase
+class ChargeSocialesTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index db6b3299bd5..b7636a5c934 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CodingPhpTest extends PHPUnit_Framework_TestCase
+class CodingPhpTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 277328339ee..c249c47bd91 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
+class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 00a0a4983c9..570165f3382 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommandeTest extends PHPUnit_Framework_TestCase
+class CommandeTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index 549540bb0d0..e4bd0f73518 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommonObjectTest extends PHPUnit_Framework_TestCase
+class CommonObjectTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 58eebfd0207..08749d12619 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
+class CompanyBankAccountTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
index 0fb1722aee9..9e211441103 100644
--- a/test/phpunit/CompanyLibTest.php
+++ b/test/phpunit/CompanyLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CompanyLibTest extends PHPUnit_Framework_TestCase
+class CompanyLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index ef43bd06311..c0ed8d7843f 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -53,7 +53,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ContactTest extends PHPUnit_Framework_TestCase
+class ContactTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index c5342865979..c763a976172 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ContratTest extends PHPUnit_Framework_TestCase
+class ContratTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 51a0f54698f..4720df9014c 100644
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CoreTest extends PHPUnit_Framework_TestCase
+class CoreTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 6424cb4d8df..cc4f50705e0 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DateLibTest extends PHPUnit_Framework_TestCase
+class DateLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index fa7aef2bed8..8913c56a77d 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
+class DateLibTzFranceTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index cd73a7ad173..8c461aba88a 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DiscountTest extends PHPUnit_Framework_TestCase
+class DiscountTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 16555d88e39..44f4d086a1c 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class EntrepotTest extends PHPUnit_Framework_TestCase
+class EntrepotTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
index c4b3e2a707a..570afd8bb18 100644
--- a/test/phpunit/ExpenseReportTest.php
+++ b/test/phpunit/ExpenseReportTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ExpenseReportTest extends PHPUnit_Framework_TestCase
+class ExpenseReportTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 7403cba3ddf..5497f88cd67 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -49,7 +49,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ExportTest extends PHPUnit_Framework_TestCase
+class ExportTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 33d503825ac..4d7df1f0ed7 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureFournisseurTest extends PHPUnit_Framework_TestCase
+class FactureFournisseurTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index de1bb164451..5d9021032a2 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureRecTest extends PHPUnit_Framework_TestCase
+class FactureRecTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 4f680ba32db..3c066380b09 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureTest extends PHPUnit_Framework_TestCase
+class FactureTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index a0df47cd97f..1716bd51153 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureTestRounding extends PHPUnit_Framework_TestCase
+class FactureTestRounding extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index 35680559581..c81e1c99e1a 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FichinterTest extends PHPUnit_Framework_TestCase
+class FichinterTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 2411c5c9cf3..cbe6ad948d8 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FilesLibTest extends PHPUnit_Framework_TestCase
+class FilesLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index 844be2e4f32..b58b43b368b 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FormAdminTest extends PHPUnit_Framework_TestCase
+class FormAdminTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 50efabf9403..a83ba0f4859 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -48,7 +48,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class Functions2LibTest extends PHPUnit_Framework_TestCase
+class Functions2LibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 4ecaab49d39..445fe572b61 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ImagesLibTest extends PHPUnit_Framework_TestCase
+class ImagesLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 10d906f2ede..5a11a770842 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ImportTest extends PHPUnit_Framework_TestCase
+class ImportTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index a84a78a7c75..c123f2e6ff6 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class JsonLibTest extends PHPUnit_Framework_TestCase
+class JsonLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 228cde51901..71d467b78d3 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class LangTest extends PHPUnit_Framework_TestCase
+class LangTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/LoanTest.php b/test/phpunit/LoanTest.php
index b0ecd583514..e0cc1f5b5ff 100644
--- a/test/phpunit/LoanTest.php
+++ b/test/phpunit/LoanTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class LoanTest extends PHPUnit_Framework_TestCase
+class LoanTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php
index 81f4a512e4f..84fb59c81ec 100644
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class MarginsLibTest extends PHPUnit_Framework_TestCase
+class MarginsLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index ea16813d873..38a630b46e0 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ModulesTest extends PHPUnit_Framework_TestCase
+class ModulesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index cac49f34a7a..ba7b093596f 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class MouvementStockTest extends PHPUnit_Framework_TestCase
+class MouvementStockTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 66c4c670128..57c376b702b 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class NumberingModulesTest extends PHPUnit_Framework_TestCase
+class NumberingModulesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 98300a6a86a..54913b1e5f9 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PaypalTest extends PHPUnit_Framework_TestCase
+class PaypalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 634a931da56..bece387b93f 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PdfDocTest extends PHPUnit_Framework_TestCase
+class PdfDocTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index a1fcc180528..743328abb71 100644
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PgsqlTest extends PHPUnit_Framework_TestCase
+class PgsqlTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 0203a1d4275..32babae209c 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -52,7 +52,7 @@ if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PricesTest extends PHPUnit_Framework_TestCase
+class PricesTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index c57ef426d0b..4a4d108f02f 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ProductTest extends PHPUnit_Framework_TestCase
+class ProductTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index faa533e2c00..886463be104 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ProjectTest extends PHPUnit_Framework_TestCase
+class ProjectTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 6a3d17d7806..b0331a5575f 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PropalTest extends PHPUnit_Framework_TestCase
+class PropalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index f0d3efe34e6..08ea79352d3 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_UMASK = '0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
+class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 39f924e7e04..b44fb7aaccc 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class RestAPIUserTest extends PHPUnit_Framework_TestCase
+class RestAPIUserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 4e43a036c7e..e4a2263e849 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ScriptsTest extends PHPUnit_Framework_TestCase
+class ScriptsTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 636fa923bc0..b457c4c0fa7 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SecurityTest extends PHPUnit_Framework_TestCase
+class SecurityTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 11eb6711862..f823d8a4803 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SocieteTest extends PHPUnit_Framework_TestCase
+class SocieteTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index 14a63776444..ee95e882572 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SupplierProposalTest extends PHPUnit_Framework_TestCase
+class SupplierProposalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/TicketTest.php b/test/phpunit/TicketTest.php
index e5367d03fbe..4d7ce3363ed 100644
--- a/test/phpunit/TicketTest.php
+++ b/test/phpunit/TicketTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class TicketTest extends PHPUnit_Framework_TestCase
+class TicketTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index e524b989172..be230655fe1 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UserGroupTest extends PHPUnit_Framework_TestCase
+class UserGroupTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index b87dfd84494..e993ed981a6 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UserTest extends PHPUnit_Framework_TestCase
+class UserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php
index 58074af1c1f..5a913977ccc 100644
--- a/test/phpunit/UtilsTest.php
+++ b/test/phpunit/UtilsTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UtilsTest extends PHPUnit_Framework_TestCase
+class UtilsTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index fb8e36af6a1..77ad0902ec2 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -49,7 +49,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
+class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 8b989df273f..8e6312ac039 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
+class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index bdc3a15b2b9..5c19414966b 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesOtherTest extends PHPUnit_Framework_TestCase
+class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 90147a429a4..ff78d9d91bb 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -55,7 +55,7 @@ if (empty($conf->service->enabled))
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesProductsTest extends PHPUnit_Framework_TestCase
+class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index cb1f26d1980..4effe555d2f 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
+class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 7ca0d9e8ee8..d7df632e413 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesUserTest extends PHPUnit_Framework_TestCase
+class WebservicesUserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php
index 4783bf4bc8f..602ec11e46d 100644
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class XCalLibTest extends PHPUnit_Framework_TestCase
+class XCalLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;