fixes after merge of master into upgrade-sf4

This commit is contained in:
Julien Fastré 2024-02-13 10:59:30 +01:00
parent fecb561b3b
commit 9b42f328ae
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
4 changed files with 109 additions and 25 deletions

View File

@ -15,14 +15,14 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "dev-upgrade-sf5@dev", "chill-project/chill-bundles": "^2.16",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",
"phpoffice/phpword": "^0.18.2", "phpoffice/phpword": "^0.18.2",
"phpstan/phpstan": "^1.0", "phpstan/phpstan": "^1.0",
"spomky-labs/base64url": "^2.0", "spomky-labs/base64url": "^2.0",
"twig/string-extra": "^3.3", "twig/string-extra": "^3.3",
"symfony/runtime": "^5.4" "symfony/runtime": "5.4.*"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.13", "fakerphp/faker": "^1.13",

126
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8305e91891167e05d0a4a109477fa756", "content-hash": "82efae5c5aa192b641031b041f4b4729",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -223,16 +223,16 @@
}, },
{ {
"name": "chill-project/chill-bundles", "name": "chill-project/chill-bundles",
"version": "2.16.0", "version": "2.16.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://gitlab.com/Chill-Projet/chill-bundles.git", "url": "https://gitlab.com/Chill-Projet/chill-bundles.git",
"reference": "8b28667fe5d4430c541eacd0dc558b202c4f4835" "reference": "f02c5bca13882b075ca0edc0356090bd692cdc73"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=8b28667fe5d4430c541eacd0dc558b202c4f4835", "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=f02c5bca13882b075ca0edc0356090bd692cdc73",
"reference": "8b28667fe5d4430c541eacd0dc558b202c4f4835", "reference": "f02c5bca13882b075ca0edc0356090bd692cdc73",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -346,9 +346,9 @@
], ],
"support": { "support": {
"issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues", "issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues",
"source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/2.16.0" "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/2.16.1"
}, },
"time": "2024-02-08T21:21:49+00:00" "time": "2024-02-09T00:11:11+00:00"
}, },
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",
@ -2118,16 +2118,16 @@
}, },
{ {
"name": "giggsey/libphonenumber-for-php", "name": "giggsey/libphonenumber-for-php",
"version": "8.13.29", "version": "8.13.30",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git", "url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4" "reference": "e09260a4a470b3737877c0f04f964e8a4938ebbd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4", "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/e09260a4a470b3737877c0f04f964e8a4938ebbd",
"reference": "b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4", "reference": "e09260a4a470b3737877c0f04f964e8a4938ebbd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2186,7 +2186,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues", "issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php" "source": "https://github.com/giggsey/libphonenumber-for-php"
}, },
"time": "2024-01-26T08:49:18+00:00" "time": "2024-02-09T12:16:23+00:00"
}, },
{ {
"name": "giggsey/locale", "name": "giggsey/locale",
@ -4497,16 +4497,16 @@
}, },
{ {
"name": "php-opencloud/openstack", "name": "php-opencloud/openstack",
"version": "v3.8.0", "version": "v3.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-opencloud/openstack.git", "url": "https://github.com/php-opencloud/openstack.git",
"reference": "d823be3079c4772b2ddf16ff2d013f285113eb59" "reference": "38a686070d3b3a25b26e21f3c445dde1ae66fd8d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-opencloud/openstack/zipball/d823be3079c4772b2ddf16ff2d013f285113eb59", "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/38a686070d3b3a25b26e21f3c445dde1ae66fd8d",
"reference": "d823be3079c4772b2ddf16ff2d013f285113eb59", "reference": "38a686070d3b3a25b26e21f3c445dde1ae66fd8d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4568,9 +4568,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-opencloud/openstack/issues", "issues": "https://github.com/php-opencloud/openstack/issues",
"source": "https://github.com/php-opencloud/openstack/tree/v3.8.0" "source": "https://github.com/php-opencloud/openstack/tree/v3.9.0"
}, },
"time": "2024-02-05T09:29:20+00:00" "time": "2024-02-10T10:49:56+00:00"
}, },
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
@ -4901,16 +4901,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.57", "version": "1.10.58",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" "reference": "a23518379ec4defd9e47cbf81019526861623ec2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", "reference": "a23518379ec4defd9e47cbf81019526861623ec2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4959,7 +4959,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-24T11:51:34+00:00" "time": "2024-02-12T20:02:57+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@ -10298,6 +10298,86 @@
], ],
"time": "2024-01-30T13:10:15+00:00" "time": "2024-01-30T13:10:15+00:00"
}, },
{
"name": "symfony/runtime",
"version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/runtime.git",
"reference": "a32a623d71fc0f699a2a196377b3b85c840bd39a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/runtime/zipball/a32a623d71fc0f699a2a196377b3b85c840bd39a",
"reference": "a32a623d71fc0f699a2a196377b3b85c840bd39a",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0|^2.0",
"php": ">=7.2.5",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"symfony/dotenv": "<5.1"
},
"require-dev": {
"composer/composer": "^1.0.2|^2.0",
"symfony/console": "^4.4.30|^5.4.9|^6.0.9",
"symfony/dotenv": "^5.1|^6.0",
"symfony/http-foundation": "^4.4.30|^5.3.7|^6.0",
"symfony/http-kernel": "^4.4.30|^5.3.7|^6.0"
},
"type": "composer-plugin",
"extra": {
"class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin"
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Runtime\\": "",
"Symfony\\Runtime\\Symfony\\Component\\": "Internal/"
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Enables decoupling PHP applications from global state",
"homepage": "https://symfony.com",
"keywords": [
"runtime"
],
"support": {
"source": "https://github.com/symfony/runtime/tree/v5.4.35"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-01-23T13:51:25+00:00"
},
{ {
"name": "symfony/security-bundle", "name": "symfony/security-bundle",
"version": "v4.4.50", "version": "v4.4.50",

View File

@ -36,4 +36,5 @@ return [
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true], Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true], Chill\EventBundle\ChillEventBundle::class => ['all' => true],
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
]; ];

View File

@ -2,6 +2,9 @@
"brick/math": { "brick/math": {
"version": "0.9.3" "version": "0.9.3"
}, },
"champs-libres/async-uploader-bundle": {
"version": "dev-sf4"
},
"champs-libres/wopi-bundle": { "champs-libres/wopi-bundle": {
"version": "dev-master" "version": "dev-master"
}, },