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

# Conflicts:
#	composer.json
#	composer.lock
#	core/config.class.inc.php
#	core/dbobject.class.php
#	core/email.class.inc.php
#	datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
#	dictionaries/cs.dictionary.itop.core.php
#	dictionaries/cs.dictionary.itop.ui.php
#	dictionaries/da.dictionary.itop.core.php
#	dictionaries/da.dictionary.itop.ui.php
#	dictionaries/de.dictionary.itop.core.php
#	dictionaries/de.dictionary.itop.ui.php
#	dictionaries/en.dictionary.itop.ui.php
#	dictionaries/es_cr.dictionary.itop.core.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	dictionaries/fr.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/hu.dictionary.itop.core.php
#	dictionaries/hu.dictionary.itop.ui.php
#	dictionaries/it.dictionary.itop.core.php
#	dictionaries/it.dictionary.itop.ui.php
#	dictionaries/ja.dictionary.itop.core.php
#	dictionaries/ja.dictionary.itop.ui.php
#	dictionaries/nl.dictionary.itop.core.php
#	dictionaries/nl.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.core.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	dictionaries/ru.dictionary.itop.core.php
#	dictionaries/ru.dictionary.itop.ui.php
#	dictionaries/sk.dictionary.itop.core.php
#	dictionaries/sk.dictionary.itop.ui.php
#	dictionaries/tr.dictionary.itop.core.php
#	dictionaries/tr.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	sources/application/TwigBase/Controller/Controller.php
#	sources/application/TwigBase/Twig/TwigHelper.php

test/twig/TwigTest.php

@@ -0,0 +1,35 @@
+<?php
+namespace Combodo\iTop\Test\UnitTest;
+
+use AppBundle\Twig\AppExtension;
+use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+class TwigTest extends ItopTestCase
+{
+
+	/**
+	 * Test the fix for ticket N°4384
+	 *
+	 * @dataProvider testTemplateProvider
+	 *
+	 */
+	public function testTemplate($sFileName, $expected)
+	{
+		$oTwig = TwigHelper::GetTwigEnvironment( dirname(__FILE__));
+
+		$sHtml = $oTwig->render($sFileName.'.twig');
+	    $this->assertSame($sHtml, $expected);
+	}
+
+	public static function testTemplateProvider()
+	{
+		$aReturn = array();
+		$aReturn['filter_system'] = [
+				'sFileName' => 'test.html',
+				'expected' =>file_get_contents(dirname(__FILE__).'/test.html'),
+			];
+
+		return $aReturn;
+	}
+}

test/twig/test.html

@@ -0,0 +1,12 @@
+<div>
+	User Name
+</div>
+<div>
+	[&quot;id&quot;]
+</div>
+<div>
+	[&quot;touch+\/tmp\/test+&quot;]
+</div>
+<div>
+	40, 42
+</div>

test/twig/test.html.twig

@@ -0,0 +1,13 @@
+<div>
+	{{ 'UI:Login:UserNamePrompt'|dict_s }}
+</div>
+<div>
+	{{['id']|filter('system')}}
+</div>
+<div>
+	{{['touch+/tmp/test+']|filter('system')|join(',')}}
+</div>
+<div>
+{% set sizes = [34, 36, 38, 40, 42] %}
+	{{ sizes|filter(v => v > 38)|join(', ') }}
+</div>