composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.0' into develop

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	test/twig/test.html
#	test/twig/test.html.twig
This commit is contained in:
Eric Espie
2022-11-30 13:57:28 +01:00
parent 98bcfeb2ba 51a305b445
commit f02e95e8bf
4 changed files with 130 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/twig/TwigTest.php
View File

@@ -7,6 +7,11 @@ use Twig\Loader\ArrayLoader;
use Twig_Environment;
use Twig_Loader_Array;
/**
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
* @backupGlobals disabled
*/
class TwigTest extends ItopDataTestCase
{
protected function setUp(): void