From 8b3edd36eaea2985180e5d51666834563976582e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 10:37:55 +0100 Subject: [PATCH] Fix warning --- htdocs/product/class/product.class.php | 2 +- test/phpunit/ContactTest.php | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 740a2633a80..f6c31f8ac41 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1091,7 +1091,7 @@ class Product extends CommonObject } if (!$error) { - if ($conf->variants->enabled) { + if (!empty($conf->variants->enabled)) { include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php'; $comb = new ProductCombination($this->db); diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php index 0c5687e67c9..7d7e2740bc1 100755 --- a/test/phpunit/ContactTest.php +++ b/test/phpunit/ContactTest.php @@ -334,25 +334,6 @@ class ContactTest extends PHPUnit\Framework\TestCase return $result; } - /** - * testContactStatic - * - * @return void - */ - public function testContactStatic() - { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; - - $localobject=new Contact($db); - - - return; - } - /** * testContactGetFullAddress *