From 56ef243d59c9e2c47d8ec366afb3832c3f99577b Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Mon, 3 Jul 2023 16:11:39 +0200 Subject: [PATCH 1/8] ez-calendar.raml: Remove empty description --- docs/api/rest_api/rest_api_reference/input/ez-calendar.raml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-calendar.raml b/docs/api/rest_api/rest_api_reference/input/ez-calendar.raml index 449ae87b73..1e990bb0d4 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-calendar.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-calendar.raml @@ -81,7 +81,6 @@ displayName: Calendar description: A calendar action that e.g. reschedules or unschedules calendar events. The event type should always be copied from an event. headers: Content-Type: - description: example: | application/vnd.ibexa.api.calendar.future_publication.UnscheduleAction+json body: From bdb9615ff1f1153c87ec502980550cfbcc7117dc Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Mon, 3 Jul 2023 16:51:13 +0200 Subject: [PATCH 2/8] ez-corporate.raml: Remove empty description --- docs/api/rest_api/rest_api_reference/input/ez-corporate.raml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-corporate.raml b/docs/api/rest_api/rest_api_reference/input/ez-corporate.raml index c5cd0af1f6..0bc2bec903 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-corporate.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-corporate.raml @@ -73,7 +73,6 @@ get: post: displayName: Create a company - description: headers: Accept: description: If set, the new company is returned in XML or JSON format. From b95a01faffb7a96e93ec9f0f00a9430d572c659c Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Mon, 3 Jul 2023 16:51:53 +0200 Subject: [PATCH 3/8] ez-types.raml: Type array items --- .../rest_api_reference/input/ez-types.raml | 77 ++++++++++++------- 1 file changed, 51 insertions(+), 26 deletions(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index 97059475e7..4d138a28d9 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -559,10 +559,10 @@ ContentTypeUpdateStruct: type: datetime names: description: 'If set this array of names with languageCode keys replace the complete name collection.' - type: array + type: string[] descriptions: description: 'If set this array of descriptions with languageCode keys replace the complete description collection.' - type: array + type: string[] ContentUpdateStruct: description: 'This class is used for updating the fields of a Content item draft.' @@ -615,6 +615,7 @@ CreateStruct: data: description: 'Notification data.' type: array + items: mixed Criterion: description: 'Criterion implementations.' type: object @@ -625,6 +626,7 @@ Criterion: value: description: 'The value(s) matched by the Criteria.' type: array + items: mixed target: description: 'The target used by the Criteria (field, metadata...).' type: string @@ -813,10 +815,10 @@ FieldDefinitionCreateStruct: type: string names: description: 'An array of names with languageCode keys.' - type: array + type: string[] descriptions: description: 'An array of descriptions with languageCode keys.' - type: array + type: string[] fieldGroup: description: 'Field group name.' type: string @@ -853,10 +855,10 @@ FieldDefinitionUpdateStruct: type: string names: description: 'If set this array of names with languageCode keys replace the complete name collection.' - type: array + type: string[] descriptions: description: 'If set this array of descriptions with languageCode keys replace the complete description collection.' - type: array + type: string[] fieldGroup: description: 'If set the field group is changed to this name.' type: string @@ -908,6 +910,8 @@ Language: ALL: description: "Constant for use in API's to specify that you want to load all languages." type: array + items: string + maxItems: 0 id: description: 'The language ID (auto generated).' type: integer @@ -1073,6 +1077,7 @@ Message: values: description: 'Translation value objects. May not contain any numbers, which might result in requiring plural forms. Use Plural for that.' type: array + items: mixed Notification: description: 'This class represents a notification value.' type: object @@ -1095,6 +1100,7 @@ Notification: data: description: 'This class represents data.' type: array + items: mixed NotificationList: description: 'This class represents a notifications list.' type: object @@ -1291,6 +1297,7 @@ Plural: values: description: 'Translation value objects. May not contain any numbers, which might result in requiring plural forms. Use MessagePlural for that.' type: array + item: mixed Policy: description: 'This class represents a policy value.' type: BaseObject @@ -1720,7 +1727,7 @@ UrlAlias: type: any path: description: 'The full path of the alias.' - type: + type: string languageCodes: description: 'The languageCodes for which this path is valid.' type: string[] @@ -2046,6 +2053,7 @@ ValueObject: Properties: description: 'Function where list of properties are returned.' type: array + items: mixed Version: description: 'Returns the VersionInfo for this version.' type: BaseObject @@ -2175,9 +2183,9 @@ ContentTypeCreate: defaultAlwaysAvailable: type: boolean names: - type: array + type: string[] descriptions: - type: array + type: string[] FieldDefinition: type: FieldDefinition creatorId: @@ -2212,9 +2220,9 @@ ContentTypeUpdate: defaultAlwaysAvailable: type: boolean names: - type: array + type: string[] descriptions: - type: array + type: string[] modifierId: description: 'If set, this value overrides the current user as creator.' type: any @@ -2475,9 +2483,9 @@ CatalogCreate: Criteria: type: Criterion names: - type: array + type: string[] descriptions: - type: array + type: string[] status: type: string creator_id: @@ -2494,9 +2502,9 @@ CatalogUpdate: Criteria: type: Criterion names: - type: array + type: string[] descriptions: - type: array + type: string[] CatalogCopy: description: 'This class is used to copy a catalog.' @@ -2610,11 +2618,12 @@ AttributeGroupCreate: identifier: type: string names: - type: array + type: string[] position: type: integer languages: type: array + items: mixed AttributeGroupUpdate: description: 'This class is used to update an attribute group.' @@ -2623,11 +2632,12 @@ AttributeGroupUpdate: identifier: type: string names: - type: array + type: string[] position: type: integer languages: type: array + items: mixed AttributeGroupList: description: 'This class represents an attribute group list.' @@ -2670,6 +2680,7 @@ Attribute: type: integer options: type: array + items: mixed AttributeCreate: description: 'This class is used to create an attribute.' @@ -2682,13 +2693,14 @@ AttributeCreate: group: type: string names: - type: array + type: string[] descriptions: - type: array + type: string[] positions: type: integer options: type: array + items: mixed AttributeUpdate: description: 'This class is used to update an attribute.' @@ -2697,13 +2709,14 @@ AttributeUpdate: identifier: type: string names: - type: array + type: string[] descriptions: - type: array + type: string[] positions: type: integer options: type: array + items: mixed AttributeList: description: 'This class represents an attribute list.' @@ -2780,9 +2793,9 @@ CustomerGroupCreate: identifier: type: string names: - type: array + type: string[] descriptions: - type: array + type: string[] global_price_rate: description: 'numeric-string' type: string @@ -2792,13 +2805,14 @@ CustomerGroupUpdate: type: object properties: names: - type: array + type: string[] identifier: type: string position: type: integer languages: type: array + items: mixed CustomerGroupViewInput: description: 'This class represents a customer group view input.' @@ -2941,6 +2955,7 @@ ProductListGet: type: integer languages: type: array + items: mixed ProductGet: description: 'This class represents a product GET.' @@ -2948,6 +2963,7 @@ ProductGet: properties: languages: type: array + items: mixed ProductCreate: description: 'This class is used to create a product.' @@ -2959,6 +2975,7 @@ ProductCreate: type: string attributes: type: array + items: mixed ProductUpdate: description: 'This class is used to create a product.' @@ -2970,6 +2987,7 @@ ProductUpdate: type: string attributes: type: array + items: mixed ProductViewInput: description: 'This class represents a product view input.' @@ -3001,6 +3019,7 @@ ProductVariant: type: Product DiscriminatorAttributesList: type: array + items: mixed ProductVariantCreate: description: 'This class is used to create a product variant.' @@ -3011,6 +3030,7 @@ ProductVariantCreate: attributes: description: 'array' type: array + items: mixed ProductVariantGenerate: description: 'This class is used to generate a product variant.' @@ -3019,6 +3039,7 @@ ProductVariantGenerate: attributes: description: 'array' type: array + items: mixed ProductVariantUpdate: description: 'This class is used to update a product variant.' @@ -3029,6 +3050,7 @@ ProductVariantUpdate: attributes: description: 'array' type: array + items: mixed ProductVariantViewInput: description: 'This class represents a product variant view input.' @@ -3086,7 +3108,7 @@ TaxonomyEntry: mainLanguageCode: type: string names: - type: array + type: string[] Parent: type: TaxonomyEntry Content: @@ -3138,7 +3160,7 @@ TaxonomyEntryUpdateStruct: name: type: string names: - type: array + type: string[] languageCode: type: string mainLanguageCode: @@ -3327,6 +3349,7 @@ Order: type: OrderItem[] context: type: array + items: mixed OrderUser: description: 'This class represents order user.' @@ -3413,6 +3436,7 @@ OrderItem: type: integer context: type: array + items: mixed OrderItemValue: description: 'This class represents order item value.' @@ -3650,6 +3674,7 @@ PaymentMethodUpdateStruct: type: boolean options: type: array + items: mixed PaymentMethodView: type: object From 17d090ed9b466971f8152a0805ce81b00014d447 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Mon, 3 Jul 2023 17:15:06 +0200 Subject: [PATCH 4/8] ez-types.raml: Type array items --- docs/api/rest_api/rest_api_reference/input/ez-types.raml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index 4d138a28d9..fe4ad1be79 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -1297,7 +1297,7 @@ Plural: values: description: 'Translation value objects. May not contain any numbers, which might result in requiring plural forms. Use MessagePlural for that.' type: array - item: mixed + items: mixed Policy: description: 'This class represents a policy value.' type: BaseObject From 069c8e44aa5827d936b61dd3f4504e121cefb1e7 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Wed, 5 Jul 2023 09:13:11 +0200 Subject: [PATCH 5/8] ez-types.raml: No AttributeGroupCreate languages `AttributeGroupCreate` got no `languages` property. - No `languages` is parsed in https://github.com/ibexa/product-catalog/blob/main/src/bundle/REST/Input/Parser/AttributeGroupCreate.php - No `languages` in examples/product/catalog/attribute_groups/POST/AttributeGroupCreate.json.example --- docs/api/rest_api/rest_api_reference/input/ez-types.raml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index fe4ad1be79..55a58b3c79 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -2621,9 +2621,6 @@ AttributeGroupCreate: type: string[] position: type: integer - languages: - type: array - items: mixed AttributeGroupUpdate: description: 'This class is used to update an attribute group.' From 3232ae52cb11de6a8765a614210e34aa8bec10f4 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Wed, 5 Jul 2023 11:24:57 +0200 Subject: [PATCH 6/8] ez-types.raml: No const Language::ALL Language is only used in response to GET /languages/{code} or GET /languages (see docs/api/rest_api/rest_api_reference/input/ez-languages.raml) The Language::ALL constant can't be used in REST It comes from https://github.com/ibexa/core/blob/main/src/contracts/Repository/Values/Content/Language.php#L26 Language has no REST input parser. Language's output parser never use ALL (see https://github.com/ibexa/rest/blob/main/src/lib/Server/Output/ValueObjectVisitor/Language.php) --- docs/api/rest_api/rest_api_reference/input/ez-types.raml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index 55a58b3c79..0865f7a9ae 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -907,11 +907,6 @@ Language: description: 'This class represents a language in the Repository.' type: BaseObject properties: - ALL: - description: "Constant for use in API's to specify that you want to load all languages." - type: array - items: string - maxItems: 0 id: description: 'The language ID (auto generated).' type: integer From 7b7e6d2c04f3a0b9c26e1d18b9d3491c39104607 Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Wed, 5 Jul 2023 15:10:18 +0200 Subject: [PATCH 7/8] ez-types: Fix several languages related properties Old language system uses Value; newer uses an object with language codes as properties/keys. --- .../rest_api_reference/input/ez-types.raml | 53 ++++++++----------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index 0865f7a9ae..a4ace9b2de 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -559,10 +559,10 @@ ContentTypeUpdateStruct: type: datetime names: description: 'If set this array of names with languageCode keys replace the complete name collection.' - type: string[] + type: Value[] descriptions: description: 'If set this array of descriptions with languageCode keys replace the complete description collection.' - type: string[] + type: Value[] ContentUpdateStruct: description: 'This class is used for updating the fields of a Content item draft.' @@ -815,10 +815,10 @@ FieldDefinitionCreateStruct: type: string names: description: 'An array of names with languageCode keys.' - type: string[] + type: Value[] descriptions: description: 'An array of descriptions with languageCode keys.' - type: string[] + type: Value[] fieldGroup: description: 'Field group name.' type: string @@ -855,10 +855,10 @@ FieldDefinitionUpdateStruct: type: string names: description: 'If set this array of names with languageCode keys replace the complete name collection.' - type: string[] + type: Value[] descriptions: description: 'If set this array of descriptions with languageCode keys replace the complete description collection.' - type: string[] + type: Value[] fieldGroup: description: 'If set the field group is changed to this name.' type: string @@ -2178,9 +2178,9 @@ ContentTypeCreate: defaultAlwaysAvailable: type: boolean names: - type: string[] + type: Value[] descriptions: - type: string[] + type: Value[] FieldDefinition: type: FieldDefinition creatorId: @@ -2215,9 +2215,9 @@ ContentTypeUpdate: defaultAlwaysAvailable: type: boolean names: - type: string[] + type: Value[] descriptions: - type: string[] + type: Value[] modifierId: description: 'If set, this value overrides the current user as creator.' type: any @@ -2478,9 +2478,9 @@ CatalogCreate: Criteria: type: Criterion names: - type: string[] + type: object descriptions: - type: string[] + type: object status: type: string creator_id: @@ -2497,9 +2497,9 @@ CatalogUpdate: Criteria: type: Criterion names: - type: string[] + type: object descriptions: - type: string[] + type: object CatalogCopy: description: 'This class is used to copy a catalog.' @@ -2624,12 +2624,9 @@ AttributeGroupUpdate: identifier: type: string names: - type: string[] + type: object position: type: integer - languages: - type: array - items: mixed AttributeGroupList: description: 'This class represents an attribute group list.' @@ -2685,9 +2682,9 @@ AttributeCreate: group: type: string names: - type: string[] + type: object descriptions: - type: string[] + type: object positions: type: integer options: @@ -2701,9 +2698,9 @@ AttributeUpdate: identifier: type: string names: - type: string[] + type: object descriptions: - type: string[] + type: object positions: type: integer options: @@ -2785,9 +2782,9 @@ CustomerGroupCreate: identifier: type: string names: - type: string[] + type: object descriptions: - type: string[] + type: object global_price_rate: description: 'numeric-string' type: string @@ -2797,14 +2794,11 @@ CustomerGroupUpdate: type: object properties: names: - type: string[] + type: object identifier: type: string position: type: integer - languages: - type: array - items: mixed CustomerGroupViewInput: description: 'This class represents a customer group view input.' @@ -2946,8 +2940,7 @@ ProductListGet: limit: type: integer languages: - type: array - items: mixed + type: string[] ProductGet: description: 'This class represents a product GET.' From d8ea35b9e937c207813256ce9ff4a088e13ea3db Mon Sep 17 00:00:00 2001 From: Adrien Dupuis Date: Wed, 5 Jul 2023 16:15:36 +0200 Subject: [PATCH 8/8] ez-types.raml: Fix PHP assoc array vs JSON object --- .../rest_api_reference/input/ez-types.raml | 27 +-- .../rest_api_reference.html | 223 +++++++++--------- 2 files changed, 120 insertions(+), 130 deletions(-) diff --git a/docs/api/rest_api/rest_api_reference/input/ez-types.raml b/docs/api/rest_api/rest_api_reference/input/ez-types.raml index a4ace9b2de..0e347b3179 100644 --- a/docs/api/rest_api/rest_api_reference/input/ez-types.raml +++ b/docs/api/rest_api/rest_api_reference/input/ez-types.raml @@ -2668,8 +2668,7 @@ Attribute: position: type: integer options: - type: array - items: mixed + type: object AttributeCreate: description: 'This class is used to create an attribute.' @@ -2947,8 +2946,7 @@ ProductGet: type: object properties: languages: - type: array - items: mixed + type: string[] ProductCreate: description: 'This class is used to create a product.' @@ -2960,10 +2958,10 @@ ProductCreate: type: string attributes: type: array - items: mixed + items: object ProductUpdate: - description: 'This class is used to create a product.' + description: 'This class is used to update a product.' type: object properties: ContentUpdate: @@ -2972,7 +2970,7 @@ ProductUpdate: type: string attributes: type: array - items: mixed + items: object ProductViewInput: description: 'This class represents a product view input.' @@ -3003,8 +3001,7 @@ ProductVariant: Product: type: Product DiscriminatorAttributesList: - type: array - items: mixed + type: Attribute[] ProductVariantCreate: description: 'This class is used to create a product variant.' @@ -3093,7 +3090,8 @@ TaxonomyEntry: mainLanguageCode: type: string names: - type: string[] + type: array + items: mixed Parent: type: TaxonomyEntry Content: @@ -3145,7 +3143,8 @@ TaxonomyEntryUpdateStruct: name: type: string names: - type: string[] + type: array + items: mixed languageCode: type: string mainLanguageCode: @@ -3333,8 +3332,7 @@ Order: OrderItemsList: type: OrderItem[] context: - type: array - items: mixed + type: object OrderUser: description: 'This class represents order user.' @@ -3420,8 +3418,7 @@ OrderItem: quantity: type: integer context: - type: array - items: mixed + type: object OrderItemValue: description: 'This class represents order item value.' diff --git a/docs/api/rest_api/rest_api_reference/rest_api_reference.html b/docs/api/rest_api/rest_api_reference/rest_api_reference.html index 8d5d9301ed..fcbaa5dd63 100644 --- a/docs/api/rest_api/rest_api_reference/rest_api_reference.html +++ b/docs/api/rest_api/rest_api_reference/rest_api_reference.html @@ -110220,7 +110220,7 @@
Types
ProductUpdate - This class is used to create a product. + This class is used to update a product. @@ -119986,7 +119986,7 @@
Types
* -([] +(Value[] ) - @@ -119999,7 +119999,7 @@
Types
* -([] +(Value[] ) - @@ -120257,7 +120257,7 @@
Types
* -([] +(mixed[] ) - @@ -120310,7 +120310,7 @@
Types
* -([] +(mixed[] ) - @@ -121257,7 +121257,7 @@
Types
* -([] +(Value[] ) - @@ -121270,7 +121270,7 @@
Types
* -([] +(Value[] ) - @@ -121431,7 +121431,7 @@
Types
* -([] +(Value[] ) - @@ -121444,7 +121444,7 @@
Types
* -([] +(Value[] ) - @@ -121681,19 +121681,6 @@
Types
  • - ALL - - * - -([] - ) - - - - Constant for use in API's to specify that you want to load all languages. - - -
    • -
  • id * @@ -122532,7 +122519,7 @@
    Types
    * -([] +(mixed[] ) - @@ -122633,7 +122620,7 @@
    Types
    * -([] +(mixed[] ) - @@ -123634,7 +123621,7 @@
    Types
    * -([] +(mixed[] ) - @@ -126003,7 +125990,7 @@
    Types
    * -() +(string) - The full path of the alias. @@ -127679,7 +127666,7 @@
    Types
    * -([] +(mixed[] ) - @@ -128409,7 +128396,7 @@
    Types
    * -([] +(Value[] ) - @@ -128422,7 +128409,7 @@
    Types
    * -([] +(Value[] ) - @@ -128611,7 +128598,7 @@
    Types
    * -([] +(Value[] ) - @@ -128624,7 +128611,7 @@
    Types
    * -([] +(Value[] ) - @@ -130233,26 +130220,32 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • descriptions * -([] - ) +(object) - +
    +
      +
    +
  • status @@ -130351,26 +130344,32 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • descriptions * -([] - ) +(object) - +
    +
      +
    +
@@ -131033,7 +131032,7 @@
Types
* -([] +(string[] ) - @@ -131052,19 +131051,6 @@
Types
 - -
  • - languages - - * - -([] - ) - - - - - -
    • @@ -131111,13 +131097,16 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • position @@ -131130,19 +131119,6 @@
    Types
    -
    • -
  • - languages - - * - -([] - ) - - - - - -
    • @@ -131402,13 +131378,16 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
    @@ -131479,26 +131458,32 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • descriptions * -([] - ) +(object) - +
    +
      +
    +
  • positions @@ -131517,7 +131502,7 @@
    Types
    * -([] +(mixed[] ) - @@ -131570,26 +131555,32 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • descriptions * -([] - ) +(object) - +
    +
      +
    +
  • positions @@ -131608,7 +131599,7 @@
    Types
    * -([] +(mixed[] ) - @@ -132065,26 +132056,32 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • descriptions * -([] - ) +(object) - +
    +
      +
    +
  • global_price_rate @@ -132131,13 +132128,16 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
  • identifier @@ -132162,19 +132162,6 @@
    Types
    -
    • -
  • - languages - - * - -([] - ) - - - - - -
    • @@ -133035,7 +133022,7 @@
    Types
    * -([] +(string[] ) - @@ -133076,7 +133063,7 @@
    Types
    * -([] +(string[] ) - @@ -133145,7 +133132,7 @@
    Types
    * -([] +(object[] ) - @@ -133176,7 +133163,7 @@
    Types
    (object) - - This class is used to create a product. + This class is used to update a product.
    @@ -133214,7 +133201,7 @@
    Types
    * -([] +(object[] ) - @@ -133411,7 +133398,7 @@
    Types
    * -([] +(Attribute[] ) - @@ -133464,7 +133451,7 @@
    Types
    * -([] +(mixed[] ) - @@ -133505,7 +133492,7 @@
    Types
    * -([] +(mixed[] ) - @@ -133558,7 +133545,7 @@
    Types
    * -([] +(mixed[] ) - @@ -133920,7 +133907,7 @@
    Types
    * -([] +(mixed[] ) - @@ -134226,7 +134213,7 @@
    Types
    * -([] +(mixed[] ) - @@ -135388,13 +135375,16 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
    @@ -135915,13 +135905,16 @@
    Types
    * -([] - ) +(object) - +
    +
      +
    +
    @@ -137183,7 +137176,7 @@
    Types
    * -([] +(mixed[] ) -