Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
This commit is contained in:
Pierre Goiffon
2024-03-13 09:59:28 +01:00

View File

@@ -46,8 +46,8 @@ class SetupUtilsTest extends ItopTestCase
$this->assertTrue($bLabelFound, "label '$sLabel' not found");
}
public function CheckGraphvizProvider(){
if (substr(PHP_OS,0,3) === 'WIN'){
public function CheckGraphvizProvider() {
if (substr(PHP_OS, 0, 3) === 'WIN') {
return [];
}