Merge branch '1.10'

res/composer-schema.json

@@ -377,13 +377,13 @@
             "type": ["object", "array"],
             "description": "A set of additional repositories where packages can be found.",
             "additionalProperties": {
-                "oneOf": [
+                "anyOf": [
                     { "$ref": "#/definitions/repository" },
                     { "type": "boolean", "enum": [false] }
                 ]
             },
             "items": {
-                "oneOf": [
+                "anyOf": [
                     { "$ref": "#/definitions/repository" },
                     {
                         "type": "object",
@@ -652,7 +652,7 @@
         },
         "repository": {
             "type": "object",
-            "oneOf": [
+            "anyOf": [
                 { "$ref": "#/definitions/composer-repository" },
                 { "$ref": "#/definitions/vcs-repository" },
                 { "$ref": "#/definitions/path-repository" },