mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-03 15:38:44 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # composer.json # composer.lock # core/email.class.inc.php # css/ui-lightness/jqueryui.scss # lib/bin/php-parse # lib/bin/php-parse.bat # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/composer/platform_check.php # lib/nikic/php-parser/grammar/php7.y # lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Builder/Param.php # lib/nikic/php-parser/lib/PhpParser/Builder/Property.php # lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php # lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php # lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php # lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php # lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Param.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php # lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php # lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php # lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php # test/core/ConfigValidator/iTopConfigAstValidatorTest.php
This commit is contained in:
Pierre Goiffon
@@ -5,7 +5,7 @@
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
|
||||
'reference' => '73b0ed47a8fc8460fb36ada4f490d84e56ff130b',
|
||||
'name' => '__root__',
|
||||
'dev' => true,
|
||||
),
|
||||
@@ -16,25 +16,43 @@
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
|
||||
'reference' => '73b0ed47a8fc8460fb36ada4f490d84e56ff130b',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'combodo/tcpdf' => array(
|
||||
'pretty_version' => '6.3.5',
|
||||
'version' => '6.3.5.0',
|
||||
'pretty_version' => '6.4.4',
|
||||
'version' => '6.4.4.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../combodo/tcpdf',
|
||||
'aliases' => array(),
|
||||
'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94',
|
||||
'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'doctrine/lexer' => array(
|
||||
'pretty_version' => '1.2.3',
|
||||
'version' => '1.2.3.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../doctrine/lexer',
|
||||
'aliases' => array(),
|
||||
'reference' => 'c268e882d4dbdd85e36e4ad69e02dc284f89d229',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'egulias/email-validator' => array(
|
||||
'pretty_version' => '2.1.25',
|
||||
'version' => '2.1.25.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../egulias/email-validator',
|
||||
'aliases' => array(),
|
||||
'reference' => '0dbf5d78455d4d6a41d186da50adc1122ec066f4',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'nikic/php-parser' => array(
|
||||
'pretty_version' => 'v4.12.0',
|
||||
'version' => '4.12.0.0',
|
||||
'pretty_version' => 'v4.13.2',
|
||||
'version' => '4.13.2.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../nikic/php-parser',
|
||||
'aliases' => array(),
|
||||
'reference' => '6608f01670c3cc5079e18c1dab1104e002579143',
|
||||
'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'paragonie/random_compat' => array(
|
||||
@@ -158,21 +176,21 @@
|
||||
),
|
||||
),
|
||||
'scssphp/scssphp' => array(
|
||||
'pretty_version' => '1.0.6',
|
||||
'version' => '1.0.6.0',
|
||||
'pretty_version' => 'v1.10.2',
|
||||
'version' => '1.10.2.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../scssphp/scssphp',
|
||||
'aliases' => array(),
|
||||
'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c',
|
||||
'reference' => '387f4f4abf5d99f16be16314c5ab856f81c82f46',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'swiftmailer/swiftmailer' => array(
|
||||
'pretty_version' => 'v5.4.12',
|
||||
'version' => '5.4.12.0',
|
||||
'pretty_version' => 'v6.3.0',
|
||||
'version' => '6.3.0.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
|
||||
'aliases' => array(),
|
||||
'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950',
|
||||
'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/cache' => array(
|
||||
@@ -319,6 +337,33 @@
|
||||
'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-iconv' => array(
|
||||
'pretty_version' => 'v1.25.0',
|
||||
'version' => '1.25.0.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../symfony/polyfill-iconv',
|
||||
'aliases' => array(),
|
||||
'reference' => 'f1aed619e28cb077fc83fac8c4c0383578356e40',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-intl-idn' => array(
|
||||
'pretty_version' => 'v1.25.0',
|
||||
'version' => '1.25.0.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
|
||||
'aliases' => array(),
|
||||
'reference' => '749045c69efb97c70d25d7463abba812e91f3a44',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-intl-normalizer' => array(
|
||||
'pretty_version' => 'v1.25.0',
|
||||
'version' => '1.25.0.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
|
||||
'aliases' => array(),
|
||||
'reference' => '8590a5f561694770bdcd3f9b5c69dde6945028e8',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-mbstring' => array(
|
||||
'pretty_version' => 'v1.19.0',
|
||||
'version' => '1.19.0.0',
|
||||
@@ -346,6 +391,15 @@
|
||||
'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-php72' => array(
|
||||
'pretty_version' => 'v1.25.0',
|
||||
'version' => '1.25.0.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../symfony/polyfill-php72',
|
||||
'aliases' => array(),
|
||||
'reference' => '9a142215a36a3888e30d0a9eeea9766764e96976',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/polyfill-util' => array(
|
||||
'pretty_version' => 'v1.19.0',
|
||||
'version' => '1.19.0.0',
|
||||
@@ -421,16 +475,16 @@
|
||||
'tecnickcom/tcpdf' => array(
|
||||
'dev_requirement' => false,
|
||||
'replaced' => array(
|
||||
0 => '6.3.5',
|
||||
0 => '6.4.4',
|
||||
),
|
||||
),
|
||||
'twig/twig' => array(
|
||||
'pretty_version' => 'v1.42.4',
|
||||
'version' => '1.42.4.0',
|
||||
'pretty_version' => 'v1.42.5',
|
||||
'version' => '1.42.5.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../twig/twig',
|
||||
'aliases' => array(),
|
||||
'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152',
|
||||
'reference' => '87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user