Pierre Goiffon
ddd41d2ba7
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
2022-04-29 16:18:08 +02:00
