Merge branch 'update-deps' into 'v1.1.x'

Update deps and bump to 1.1.17

See merge request framasoft/framadate/framadate!496
This commit is contained in:
Thomas Citharel 2021-10-18 14:30:59 +00:00
commit d971e015a6
5 changed files with 861 additions and 447 deletions

2
.gitignore vendored
View File

@ -10,7 +10,7 @@ vendor
cache/
tpl_c/*
!tpl_c/.gitkeep
.php_cs.cache
.php-cs-fixer.cache
.zanata-cache/
# Temp files

View File

@ -1,6 +1,6 @@
<?php
return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'array_syntax' => [
@ -8,7 +8,8 @@ return PhpCsFixer\Config::create()
],
'combine_consecutive_unsets' => true,
'heredoc_to_nowdoc' => true,
'no_extra_consecutive_blank_lines' => [
'no_extra_blank_lines' => [
'tokens' => [
'break',
'continue',
'extra',
@ -18,6 +19,7 @@ return PhpCsFixer\Config::create()
'parenthesis_brace_block',
'square_brace_block',
'curly_brace_block'
]
],
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
@ -38,7 +40,8 @@ return PhpCsFixer\Config::create()
->exclude([
'vendor',
'var',
'web'
'web',
'tpl_c'
])
->in(__DIR__)
)

View File

@ -18,7 +18,7 @@
*/
// FRAMADATE version
const VERSION = '1.1.16';
const VERSION = '1.1.17';
// PHP Needed version
const PHP_NEEDED_VERSION = '7.3';

View File

@ -63,12 +63,12 @@
"ircmaxell/password-compat": "dev-master",
"roave/security-advisories": "dev-master",
"erusev/parsedown": "^1.7",
"egulias/email-validator": "~2.1",
"egulias/email-validator": "^3.1",
"sabre/vobject": "~4.1"
},
"require-dev": {
"phpunit/phpunit": "^9",
"friendsofphp/php-cs-fixer": "~2.0"
"friendsofphp/php-cs-fixer": "^3.2"
},
"autoload": {
"psr-4": {

1273
composer.lock generated

File diff suppressed because it is too large Load Diff