Merge remote-tracking branch 'upstream/develop' into 14a27

This commit is contained in:
Alexandre SPANGARO 2021-03-31 04:35:48 +02:00
commit 8ac5d91f20

View File

@ -79,7 +79,7 @@ class InventoryTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
public static function setUpBeforeClass():void public static function setUpBeforeClass()
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
@ -93,7 +93,7 @@ class InventoryTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
public static function tearDownAfterClass():void public static function tearDownAfterClass()
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$db->rollback(); $db->rollback();
@ -106,7 +106,7 @@ class InventoryTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
protected function setUp():void protected function setUp()
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$conf=$this->savconf; $conf=$this->savconf;
@ -122,7 +122,7 @@ class InventoryTest extends PHPUnit\Framework\TestCase
* *
* @return void * @return void
*/ */
protected function tearDown():void protected function tearDown()
{ {
print __METHOD__."\n"; print __METHOD__."\n";
} }