Skip to content

Commit

Permalink
Merge pull request #509 from nextcloud/bump/symfony/4.4.15
Browse files Browse the repository at this point in the history 
Bump symfony packages to 4.4.15
  • Loading branch information
@MorrisJobke
MorrisJobke authored Oct 9, 2020
2 parents 10acc20 + f712ce6 commit 9741497
Show file tree
Hide file tree
Showing 71 changed files with 290 additions and 274 deletions.
10 changes: 5 additions & 5 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"scssphp/scssphp": "1.0.3",
"stecman/symfony-console-completion": "^0.11.0",
"swiftmailer/swiftmailer": "^6.0",
"symfony/console": "4.4.10",
"symfony/event-dispatcher": "4.4.10",
"symfony/console": "4.4.15",
"symfony/event-dispatcher": "4.4.15",
"symfony/event-dispatcher-contracts": "1.1.7",
"symfony/process": "4.4.10",
"symfony/routing": "4.4.10",
"symfony/translation": "4.4.10",
"symfony/process": "4.4.15",
"symfony/routing": "4.4.15",
"symfony/translation": "4.4.15",
"php-http/guzzle6-adapter": "^2.0",
"web-auth/webauthn-lib": "^3.1"
},
Expand Down
57 changes: 29 additions & 28 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer/ClassLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ClassLoader
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
}

return array();
Expand Down
65 changes: 33 additions & 32 deletions composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4331,17 +4331,17 @@
},
{
"name": "symfony/console",
"version": "v4.4.10",
"version_normalized": "4.4.10.0",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "326b064d804043005526f5a0494cfb49edb59bb0"
"reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
"reference": "326b064d804043005526f5a0494cfb49edb59bb0",
"url": "https://api.github.com/repos/symfony/console/zipball/90933b39c7b312fc3ceaa1ddeac7eb48cb953124",
"reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -4375,7 +4375,7 @@
"symfony/lock": "",
"symfony/process": ""
},
"time": "2020-05-30T20:06:45+00:00",
"time": "2020-09-15T07:58:55+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -4424,17 +4424,17 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.10",
"version_normalized": "4.4.10.0",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
"reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e17bb5e0663dc725f7cdcafc932132735b4725cd",
"reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd",
"shasum": ""
},
"require": {
Expand All @@ -4452,6 +4452,7 @@
"psr/log": "~1.0",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/error-handler": "~3.4|~4.4",
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/service-contracts": "^1.1|^2",
Expand All @@ -4461,7 +4462,7 @@
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
"time": "2020-05-20T08:37:50+00:00",
"time": "2020-09-18T14:07:46+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -5127,23 +5128,23 @@
},
{
"name": "symfony/process",
"version": "v4.4.10",
"version_normalized": "4.4.10.0",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
"reference": "9b887acc522935f77555ae8813495958c7771ba7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"url": "https://api.github.com/repos/symfony/process/zipball/9b887acc522935f77555ae8813495958c7771ba7",
"reference": "9b887acc522935f77555ae8813495958c7771ba7",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": ">=7.1.3"
},
"time": "2020-05-30T20:06:45+00:00",
"time": "2020-09-02T16:08:58+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -5192,21 +5193,21 @@
},
{
"name": "symfony/routing",
"version": "v4.4.10",
"version_normalized": "4.4.10.0",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646"
"reference": "006b2d06672b8650998f328fc603eb6f3feb979f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/0f557911dde75c2a9652b8097bd7c9f54507f646",
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646",
"url": "https://api.github.com/repos/symfony/routing/zipball/006b2d06672b8650998f328fc603eb6f3feb979f",
"reference": "006b2d06672b8650998f328fc603eb6f3feb979f",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": ">=7.1.3"
},
"conflict": {
"symfony/config": "<4.2",
Expand All @@ -5229,7 +5230,7 @@
"symfony/http-foundation": "For using a Symfony Request object",
"symfony/yaml": "For using the YAML loader"
},
"time": "2020-05-30T20:07:26+00:00",
"time": "2020-10-01T16:25:17+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -5344,17 +5345,17 @@
},
{
"name": "symfony/translation",
"version": "v4.4.10",
"version_normalized": "4.4.10.0",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af"
"reference": "8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"url": "https://api.github.com/repos/symfony/translation/zipball/8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd",
"reference": "8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -5387,7 +5388,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
"time": "2020-05-30T20:06:45+00:00",
"time": "2020-10-02T07:34:48+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down
Loading

0 comments on commit 9741497

Please sign in to comment.