Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2022-12-22 01:08:12 +01:00
parent 394c3d5c3c 5dfd9af695
commit d5438f981d
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -95,13 +95,13 @@ notifications:
install: install:
- | - |
echo "Updating Composer" echo "Updating Composer (version 2.5 is bugged and generate phpunit error Exception: Serialization of 'Closure' is not allowed)"
rm $TRAVIS_BUILD_DIR/composer.json #rm $TRAVIS_BUILD_DIR/composer.json
rm $TRAVIS_BUILD_DIR/composer.lock #rm $TRAVIS_BUILD_DIR/composer.lock
composer -V composer -V
composer self-update composer self-update 2.4.4
composer -n init #composer -n init
composer -n config vendor-dir htdocs/includes #composer -n config vendor-dir htdocs/includes
composer -n config -g vendor-dir htdocs/includes composer -n config -g vendor-dir htdocs/includes
echo echo

2
test/phpunit/AdminLibTest.php
View File

@@ -46,6 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
*/ */
class AdminLibTest extends PHPUnit\Framework\TestCase class AdminLibTest extends PHPUnit\Framework\TestCase
{ {
protected $backupGlobalsBlacklist = array('conf', 'user', 'langs', 'db');
protected $savconf; protected $savconf;
protected $savuser; protected $savuser;
protected $savlangs; protected $savlangs;
@@ -69,6 +70,7 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
$this->savdb=$db; $this->savdb=$db;
print __METHOD__." db->type=".$db->type." user->id=".$user->id; print __METHOD__." db->type=".$db->type." user->id=".$user->id;
//print " - db ".$db->db; //print " - db ".$db->db;
print "\n"; print "\n";
} }

4
test/phpunit/phpunittest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE phpunit SYSTEM "phpunit.dtd" > <!DOCTYPE phpunit SYSTEM "phpunit.dtd" >
<phpunit <phpunit
backupGlobals="true" backupGlobals="false"
backupStaticAttributes="false" backupStaticAttributes="true"
convertErrorsToExceptions="true" convertErrorsToExceptions="true"
convertNoticesToExceptions="true" convertNoticesToExceptions="true"
convertWarningsToExceptions="true" convertWarningsToExceptions="true"