Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	test/phpunit/CoreTest.php
This commit is contained in:
Laurent Destailleur
2018-09-02 15:21:21 +02:00
parent 677d7dd0fb bd3647a9d7
commit a7dfc88b59
64 changed files with 192 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/phpunit/CodingPhpTest.php
View File

@@ -72,7 +72,9 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;