Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2023-03-28 20:24:40 +02:00
commit a67351ac43
2 changed files with 9 additions and 9 deletions

View File

@ -277,7 +277,7 @@ class AllTests
// Website
require_once dirname(__FILE__).'/WebsiteTest.php';
$suite->addTestSuite('Website');
$suite->addTestSuite('WebsiteTest');
return $suite;
}

View File

@ -110,7 +110,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*
* @return void
*/
public static function setUpBeforeClass()
public static function setUpBeforeClass(): void
{
global $conf,$user,$langs,$db;
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
@ -123,7 +123,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*
* @return void
*/
public static function tearDownAfterClass()
public static function tearDownAfterClass(): void
{
global $conf,$user,$langs,$db;
$db->rollback();
@ -136,7 +136,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*
* @return void
*/
protected function setUp()
protected function setUp(): void
{
global $conf,$user,$langs,$db;
$conf=$this->savconf;
@ -152,7 +152,7 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*
* @return void
*/
protected function tearDown()
protected function tearDown(): void
{
print __METHOD__."\n";
}
@ -169,10 +169,10 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
$s = "123') OR 1=1-- \' xxx";
/*
var_dump($s);
var_dump($db->escapeforlike($s));
var_dump($db->escape($db->escapeforlike($s)));
*/
var_dump($s);
var_dump($db->escapeforlike($s));
var_dump($db->escape($db->escapeforlike($s)));
*/
$res = getPagesFromSearchCriterias('page,blogpost', 'meta,content', $s, 2, 'date_creation', 'DESC', 'en');
//var_dump($res);