fix: better schema generation

Author: matoous

codegen/pkg/generator/collect.go

@@ -81,8 +81,10 @@ func (g *Generator) assignSchemasToTags(usage map[string]*schemaUsage) (map[stri
 			targetTag = tagNames[0]
 		}
 
-		result[targetTag] = append(result[targetTag], info.schema)
-		namespaceBySchema[schemaName] = g.namespaceForTag(targetTag)
+		if schemaIsObject(info.schema) {
+			result[targetTag] = append(result[targetTag], info.schema)
+			namespaceBySchema[schemaName] = g.namespaceForTag(targetTag)
+		}
 	}
 
 	for tag := range result {

codegen/pkg/generator/operations.go

@@ -258,6 +258,10 @@ func (g *Generator) buildResponseType(schema *base.SchemaProxy, currentNamespace
 	}
 
 	if ref := schema.GetReference(); ref != "" {
+		if !schemaIsObject(schema) {
+			return g.buildResponseTypeFromSpec(schema.Schema(), currentNamespace)
+		}
+
 		name := schemaClassName(schema)
 		namespace := g.schemaNamespaces[name]
 		typeName := name
@@ -271,7 +275,10 @@ func (g *Generator) buildResponseType(schema *base.SchemaProxy, currentNamespace
 		}
 	}
 
-	spec := schema.Schema()
+	return g.buildResponseTypeFromSpec(schema.Schema(), currentNamespace)
+}
+
+func (g *Generator) buildResponseTypeFromSpec(spec *base.Schema, currentNamespace string) *responseType {
 	if spec == nil {
 		return nil
 	}

codegen/pkg/generator/properties.go

@@ -201,6 +201,10 @@ func (g *Generator) resolvePHPType(schema *base.SchemaProxy, currentNamespace st
 	}
 
 	if ref := schema.GetReference(); ref != "" {
+		if !schemaIsObject(schema) {
+			return g.resolvePHPTypeFromSpec(schema.Schema(), currentNamespace)
+		}
+
 		name := schemaClassName(schema)
 		namespace := g.schemaNamespaces[name]
 		if namespace == "" {
@@ -215,7 +219,10 @@ func (g *Generator) resolvePHPType(schema *base.SchemaProxy, currentNamespace st
 		return typeName, typeName
 	}
 
-	spec := schema.Schema()
+	return g.resolvePHPTypeFromSpec(schema.Schema(), currentNamespace)
+}
+
+func (g *Generator) resolvePHPTypeFromSpec(spec *base.Schema, currentNamespace string) (string, string) {
 	if spec == nil {
 		return "mixed", "mixed"
 	}

codegen/pkg/generator/schemas.go

@@ -0,0 +1,55 @@
+package generator
+
+import "github.com/pb33f/libopenapi/datamodel/high/base"
+
+// schemaIsObject reports whether the provided schema describes an object that
+// warrants generating a PHP class. It walks nested compositions (allOf/oneOf/anyOf)
+// to account for aggregated object schemas.
+func schemaIsObject(schema *base.SchemaProxy) bool {
+	return schemaIsObjectWithStack(schema, make(map[*base.SchemaProxy]struct{}))
+}
+
+func schemaIsObjectWithStack(schema *base.SchemaProxy, stack map[*base.SchemaProxy]struct{}) bool {
+	if schema == nil {
+		return false
+	}
+
+	if _, ok := stack[schema]; ok {
+		return false
+	}
+	stack[schema] = struct{}{}
+	defer delete(stack, schema)
+
+	spec := schema.Schema()
+	if spec == nil {
+		return false
+	}
+
+	if hasSchemaType(spec, "object") {
+		return true
+	}
+
+	if spec.Properties != nil && spec.Properties.Len() > 0 {
+		return true
+	}
+
+	for _, composite := range spec.AllOf {
+		if schemaIsObjectWithStack(composite, stack) {
+			return true
+		}
+	}
+
+	for _, composite := range spec.AnyOf {
+		if schemaIsObjectWithStack(composite, stack) {
+			return true
+		}
+	}
+
+	for _, composite := range spec.OneOf {
+		if schemaIsObjectWithStack(composite, stack) {
+			return true
+		}
+	}
+
+	return false
+}

src/SumUp/Checkouts/Checkouts.php

@@ -89,9 +89,9 @@ class Checkout
     /**
      * Three-letter [ISO4217](https://en.wikipedia.org/wiki/ISO_4217) code of the currency for the amount. Currently supported currency values are enumerated above.
      *
-     * @var \SumUp\Shared\Currency|null
+     * @var string|null
      */
-    public ?\SumUp\Shared\Currency $currency = null;
+    public ?string $currency = null;
 
     /**
      * Unique identifying code of the merchant profile.
@@ -201,9 +201,9 @@ class CheckoutCreateRequest
     /**
      * Three-letter [ISO4217](https://en.wikipedia.org/wiki/ISO_4217) code of the currency for the amount. Currently supported currency values are enumerated above.
      *
-     * @var \SumUp\Shared\Currency
+     * @var string
      */
-    public \SumUp\Shared\Currency $currency;
+    public string $currency;
 
     /**
      * Unique identifying code of the merchant profile.
@@ -286,6 +286,132 @@ class CheckoutCreateRequest
 
 class CheckoutSuccess
 {
+    /**
+     * Unique ID of the payment checkout specified by the client application when creating the checkout resource.
+     *
+     * @var string|null
+     */
+    public ?string $checkoutReference = null;
+
+    /**
+     * Amount of the payment.
+     *
+     * @var float|null
+     */
+    public ?float $amount = null;
+
+    /**
+     * Three-letter [ISO4217](https://en.wikipedia.org/wiki/ISO_4217) code of the currency for the amount. Currently supported currency values are enumerated above.
+     *
+     * @var string|null
+     */
+    public ?string $currency = null;
+
+    /**
+     * Unique identifying code of the merchant profile.
+     *
+     * @var string|null
+     */
+    public ?string $merchantCode = null;
+
+    /**
+     * Short description of the checkout visible in the SumUp dashboard. The description can contribute to reporting, allowing easier identification of a checkout.
+     *
+     * @var string|null
+     */
+    public ?string $description = null;
+
+    /**
+     * URL to which the SumUp platform sends the processing status of the payment checkout.
+     *
+     * @var string|null
+     */
+    public ?string $returnUrl = null;
+
+    /**
+     * Unique ID of the checkout resource.
+     *
+     * @var string|null
+     */
+    public ?string $id = null;
+
+    /**
+     * Current status of the checkout.
+     *
+     * @var string|null
+     */
+    public ?string $status = null;
+
+    /**
+     * Date and time of the creation of the payment checkout. Response format expressed according to [ISO8601](https://en.wikipedia.org/wiki/ISO_8601) code.
+     *
+     * @var string|null
+     */
+    public ?string $date = null;
+
+    /**
+     * Date and time of the checkout expiration before which the client application needs to send a processing request. If no value is present, the checkout does not have an expiration time.
+     *
+     * @var string|null
+     */
+    public ?string $validUntil = null;
+
+    /**
+     * Unique identification of a customer. If specified, the checkout session and payment instrument are associated with the referenced customer.
+     *
+     * @var string|null
+     */
+    public ?string $customerId = null;
+
+    /**
+     * Created mandate
+     *
+     * @var \SumUp\Shared\MandateResponse|null
+     */
+    public ?\SumUp\Shared\MandateResponse $mandate = null;
+
+    /**
+     * List of transactions related to the payment.
+     *
+     * @var mixed[]|null
+     */
+    public ?array $transactions = null;
+
+    /**
+     * Transaction code of the successful transaction with which the payment for the checkout is completed.
+     *
+     * @var string|null
+     */
+    public ?string $transactionCode = null;
+
+    /**
+     * Transaction ID of the successful transaction with which the payment for the checkout is completed.
+     *
+     * @var string|null
+     */
+    public ?string $transactionId = null;
+
+    /**
+     * Name of the merchant
+     *
+     * @var string|null
+     */
+    public ?string $merchantName = null;
+
+    /**
+     * Refers to a url where the end user is redirected once the payment processing completes.
+     *
+     * @var string|null
+     */
+    public ?string $redirectUrl = null;
+
+    /**
+     * Object containing token information for the specified payment instrument
+     *
+     * @var array|null
+     */
+    public ?array $paymentInstrument = null;
+
 }
 
 /**
@@ -324,6 +450,27 @@ class DetailsError
 
 class ErrorExtended
 {
+    /**
+     * Short description of the error.
+     *
+     * @var string|null
+     */
+    public ?string $message = null;
+
+    /**
+     * Platform code for the error.
+     *
+     * @var string|null
+     */
+    public ?string $errorCode = null;
+
+    /**
+     * Parameter name (with relative location) to which the error applies. Parameters from embedded resources are displayed using dot notation. For example, `card.name` refers to the `name` parameter embedded in the `card` object.
+     *
+     * @var string|null
+     */
+    public ?string $param = null;
+
 }
 
 /**

src/SumUp/Members/Members.php

@@ -61,9 +61,9 @@ class Member
     /**
      * The status of the membership.
      *
-     * @var \SumUp\Shared\MembershipStatus
+     * @var string
      */
-    public \SumUp\Shared\MembershipStatus $status;
+    public string $status;
 
     /**
      * Set of user-defined key-value pairs attached to the object. Partial updates are not supported. When updating, always submit whole metadata.

src/SumUp/Memberships/Memberships.php

@@ -29,9 +29,9 @@ class Membership
      * * `merchant` - merchant account(s)
      * * `organization` - organization(s)
      *
-     * @var ResourceType
+     * @var string
      */
-    public ResourceType $type;
+    public string $type;
 
     /**
      * User's roles.
@@ -71,9 +71,9 @@ class Membership
     /**
      * The status of the membership.
      *
-     * @var \SumUp\Shared\MembershipStatus
+     * @var string
      */
-    public \SumUp\Shared\MembershipStatus $status;
+    public string $status;
 
     /**
      * Set of user-defined key-value pairs attached to the object. Partial updates are not supported. When updating, always submit whole metadata.
@@ -116,9 +116,9 @@ class MembershipResource
      * * `merchant` - merchant account(s)
      * * `organization` - organization(s)
      *
-     * @var ResourceType
+     * @var string
      */
-    public ResourceType $type;
+    public string $type;
 
     /**
      * Display name of the resource.
@@ -156,13 +156,3 @@ class MembershipResource
     public ?\SumUp\Shared\Attributes $attributes = null;
 
 }
-
-/**
- * The type of the membership resource.
- * Possible values are:
- * * `merchant` - merchant account(s)
- * * `organization` - organization(s)
- */
-class ResourceType
-{
-}

src/SumUp/Merchant/Merchant.php

@@ -343,13 +343,6 @@ class BankAccount
 
 }
 
-/**
- * Business owners information.
- */
-class BusinessOwners
-{
-}
-
 /**
  * Country Details
  */
@@ -595,9 +588,9 @@ class MerchantProfileLegacy
     /**
      * Business owners information.
      *
-     * @var BusinessOwners|null
+     * @var array[]|null
      */
-    public ?BusinessOwners $businessOwners = null;
+    public ?array $businessOwners = null;
 
     /**
      * Doing Business As information