revert to go 1.25 and revert cc4f8d9

fenollp · fenollp · commit b64124451ae3 · 2026-04-28T09:19:01.000+02:00
Signed-off-by: Pierre Fenoll &lt;pierrefenoll@gmail.com&gt;
diff --git a/.github/docs/openapi3.txt b/.github/docs/openapi3.txt
@@ -121,6 +121,11 @@ var IncludeOrigin = false
 
 FUNCTIONS
 
+func BoolPtr(value bool) *bool
+    BoolPtr is a helper for defining OpenAPI schemas.
+
+    Deprecated: Use Ptr instead.
+
 func DefaultRefNameResolver(doc *T, ref ComponentRef) string
     DefaultRefResolver is a default implementation of refNameResolver for the
     InternalizeRefs function.
@@ -169,6 +174,19 @@ func DefineStringFormatValidator(name string, validator StringFormatValidator)
     DefineStringFormatValidator defines a custom format validator for a given
     string format.
 
+func Float64Ptr(value float64) *float64
+    Float64Ptr is a helper for defining OpenAPI schemas.
+
+    Deprecated: Use Ptr instead.
+
+func Int64Ptr(value int64) *int64
+    Int64Ptr is a helper for defining OpenAPI schemas.
+
+    Deprecated: Use Ptr instead.
+
+func Ptr[T any](value T) *T
+    Ptr is a helper for defining OpenAPI schemas.
+
 func ReadFromFile(loader *Loader, location *url.URL) ([]byte, error)
     ReadFromFile is a ReadFromURIFunc which reads local file URIs.
 
@@ -218,6 +236,11 @@ func RegisterArrayUniqueItemsChecker(fn SliceUniqueItemsChecker)
     RegisterArrayUniqueItemsChecker is used to register a customized function
     used to check if JSON array have unique items.
 
+func Uint64Ptr(value uint64) *uint64
+    Uint64Ptr is a helper for defining OpenAPI schemas.
+
+    Deprecated: Use Ptr instead.
+
 func ValidateIdentifier(value string) error
     ValidateIdentifier returns an error if the given component name does not
     match IdentifierRegExp.
diff --git a/README.md b/README.md
@@ -313,6 +313,9 @@ for _, path := range doc.Paths.InMatchingOrder() {
 
 ## CHANGELOG: Sub-v1 breaking API changes
 
+### v0.137.0
+* Reinstated `openapi3.*Ptr(..)` funcs for Go 1.25
+
 ### v0.136.0
 * `openapi3.Schema.ExclusiveMin` and `openapi3.Schema.ExclusiveMax` fields changed from `bool` to `ExclusiveBound` (a union type holding `*bool` for OpenAPI 3.0 or `*float64` for OpenAPI 3.1).
 * `openapi3.Schema.PrefixItems` field changed from `[]*SchemaRef` to `SchemaRefs`.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/getkin/kin-openapi
 
-go 1.26
+go 1.25
 
 require (
 	github.com/go-openapi/jsonpointer v0.21.0
diff --git a/openapi2conv/openapi2_conv.go b/openapi2conv/openapi2_conv.go
@@ -1348,11 +1348,12 @@ func compareParameters(a, b *openapi2.Parameter) int {
 	return cmp.Compare(a.Ref, b.Ref)
 }
 
+// boolPtr returns a pointer to a bool, or nil if the value is false (to avoid storing empty values)
 func boolPtr(b bool) *bool {
-	if b {
-		return new(b)
+	if !b {
+		return nil
 	}
-	return nil
+	return &b
 }
 
 // exclusiveBoundToBool converts an ExclusiveBound to a bool for OpenAPI 2.0 compatibility
diff --git a/openapi3/encoding_test.go b/openapi3/encoding_test.go
@@ -51,7 +51,7 @@ func encoding() *Encoding {
 			},
 		},
 		Style:         "form",
-		Explode:       new(true),
+		Explode:       Ptr(true),
 		AllowReserved: true,
 	}
 }
@@ -73,17 +73,17 @@ func TestEncodingSerializationMethod(t *testing.T) {
 		},
 		{
 			name: "encoding with explode",
-			enc:  &Encoding{Explode: new(true)},
+			enc:  &Encoding{Explode: Ptr(true)},
 			want: &SerializationMethod{Style: SerializationForm, Explode: true},
 		},
 		{
 			name: "encoding with no explode",
-			enc:  &Encoding{Explode: new(false)},
+			enc:  &Encoding{Explode: Ptr(false)},
 			want: &SerializationMethod{Style: SerializationForm, Explode: false},
 		},
 		{
 			name: "encoding with style and explode ",
-			enc:  &Encoding{Style: SerializationSpaceDelimited, Explode: new(false)},
+			enc:  &Encoding{Style: SerializationSpaceDelimited, Explode: Ptr(false)},
 			want: &SerializationMethod{Style: SerializationSpaceDelimited, Explode: false},
 		},
 	}
diff --git a/openapi3/helpers.go b/openapi3/helpers.go
@@ -31,6 +31,39 @@ func ValidateIdentifier(value string) error {
 	return fmt.Errorf("identifier %q is not supported by OpenAPIv3 standard (charset: [%q])", value, identifierChars)
 }
 
+// Ptr is a helper for defining OpenAPI schemas.
+func Ptr[T any](value T) *T {
+	return &value
+}
+
+// Float64Ptr is a helper for defining OpenAPI schemas.
+//
+// Deprecated: Use Ptr instead.
+func Float64Ptr(value float64) *float64 {
+	return &value
+}
+
+// BoolPtr is a helper for defining OpenAPI schemas.
+//
+// Deprecated: Use Ptr instead.
+func BoolPtr(value bool) *bool {
+	return &value
+}
+
+// Int64Ptr is a helper for defining OpenAPI schemas.
+//
+// Deprecated: Use Ptr instead.
+func Int64Ptr(value int64) *int64 {
+	return &value
+}
+
+// Uint64Ptr is a helper for defining OpenAPI schemas.
+//
+// Deprecated: Use Ptr instead.
+func Uint64Ptr(value uint64) *uint64 {
+	return &value
+}
+
 // componentNames returns the map keys in a sorted slice.
 func componentNames[E any](s map[string]E) []string {
 	out := make([]string, 0, len(s))
diff --git a/openapi3/issue230_test.go b/openapi3/issue230_test.go
@@ -291,7 +291,7 @@ webhooks:
 						Responses: openapi3.NewResponses(
 							openapi3.WithStatus(200, &openapi3.ResponseRef{
 								Value: &openapi3.Response{
-									Description: new("OK"),
+									Description: openapi3.Ptr("OK"),
 								},
 							}),
 						),
diff --git a/openapi3/issue376_test.go b/openapi3/issue376_test.go
@@ -45,7 +45,7 @@ info:
 func TestExclusiveValuesOfValuesAdditionalProperties(t *testing.T) {
 	schema := &Schema{
 		AdditionalProperties: AdditionalProperties{
-			Has:    new(false),
+			Has:    Ptr(false),
 			Schema: NewSchemaRef("", &Schema{}),
 		},
 	}
@@ -54,7 +54,7 @@ func TestExclusiveValuesOfValuesAdditionalProperties(t *testing.T) {
 
 	schema = &Schema{
 		AdditionalProperties: AdditionalProperties{
-			Has: new(false),
+			Has: Ptr(false),
 		},
 	}
 	err = schema.Validate(t.Context())
diff --git a/openapi3/issue735_test.go b/openapi3/issue735_test.go
@@ -74,7 +74,7 @@ func TestIssue735(t *testing.T) {
 		},
 		{
 			name:   "multiple of",
-			schema: &Schema{MultipleOf: new(5.0)},
+			schema: &Schema{MultipleOf: Ptr(5.0)},
 			value:  42,
 		},
 		{
@@ -142,7 +142,7 @@ func TestIssue735(t *testing.T) {
 		{
 			name: "additional properties false",
 			schema: &Schema{AdditionalProperties: AdditionalProperties{
-				Has: new(false),
+				Has: Ptr(false),
 			}},
 			value:            map[string]any{"foo": 42},
 			extraNotContains: []any{42},
@@ -188,40 +188,40 @@ func TestIssue735(t *testing.T) {
 		{
 			name: "one of (matches more then one)",
 			schema: NewOneOfSchema(
-				&Schema{MultipleOf: new(6.0)},
-				&Schema{MultipleOf: new(7.0)},
+				&Schema{MultipleOf: Ptr(6.0)},
+				&Schema{MultipleOf: Ptr(7.0)},
 			),
 			value: 42,
 		},
 		{
 			name: "one of (no matches)",
 			schema: NewOneOfSchema(
-				&Schema{MultipleOf: new(5.0)},
-				&Schema{MultipleOf: new(10.0)},
+				&Schema{MultipleOf: Ptr(5.0)},
+				&Schema{MultipleOf: Ptr(10.0)},
 			),
 			value: 42,
 		},
 		{
 			name: "any of",
 			schema: NewAnyOfSchema(
-				&Schema{MultipleOf: new(5.0)},
-				&Schema{MultipleOf: new(10.0)},
+				&Schema{MultipleOf: Ptr(5.0)},
+				&Schema{MultipleOf: Ptr(10.0)},
 			),
 			value: 42,
 		},
 		{
 			name: "all of (match some)",
 			schema: NewAllOfSchema(
-				&Schema{MultipleOf: new(6.0)},
-				&Schema{MultipleOf: new(5.0)},
+				&Schema{MultipleOf: Ptr(6.0)},
+				&Schema{MultipleOf: Ptr(5.0)},
 			),
 			value: 42,
 		},
 		{
 			name: "all of (no match)",
 			schema: NewAllOfSchema(
-				&Schema{MultipleOf: new(10.0)},
-				&Schema{MultipleOf: new(5.0)},
+				&Schema{MultipleOf: Ptr(10.0)},
+				&Schema{MultipleOf: Ptr(5.0)},
 			),
 			value: 42,
 		},
diff --git a/openapi3/openapi3_version_test.go b/openapi3/openapi3_version_test.go
@@ -25,7 +25,7 @@ func TestWebhooksField(t *testing.T) {
 						Responses: openapi3.NewResponses(
 							openapi3.WithStatus(200, &openapi3.ResponseRef{
 								Value: &openapi3.Response{
-									Description: new("Success"),
+									Description: openapi3.Ptr("Success"),
 								},
 							}),
 						),
@@ -107,7 +107,7 @@ func TestWebhooksField(t *testing.T) {
 						Responses: openapi3.NewResponses(
 							openapi3.WithStatus(200, &openapi3.ResponseRef{
 								Value: &openapi3.Response{
-									Description: new("Success"),
+									Description: openapi3.Ptr("Success"),
 								},
 							}),
 						),
@@ -199,7 +199,7 @@ func TestVersionBasedBehavior(t *testing.T) {
 						Responses: openapi3.NewResponses(
 							openapi3.WithStatus(200, &openapi3.ResponseRef{
 								Value: &openapi3.Response{
-									Description: new("OK"),
+									Description: openapi3.Ptr("OK"),
 								},
 							}),
 						),
@@ -242,7 +242,7 @@ func TestMigrationScenario(t *testing.T) {
 					Responses: openapi3.NewResponses(
 						openapi3.WithStatus(200, &openapi3.ResponseRef{
 							Value: &openapi3.Response{
-								Description: new("Processed"),
+								Description: openapi3.Ptr("Processed"),
 							},
 						}),
 					),
diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -1256,12 +1256,12 @@ func (schema *Schema) WithMaxProperties(i int64) *Schema {
 }
 
 func (schema *Schema) WithAnyAdditionalProperties() *Schema {
-	schema.AdditionalProperties = AdditionalProperties{Has: new(true)}
+	schema.AdditionalProperties = AdditionalProperties{Has: Ptr(true)}
 	return schema
 }
 
 func (schema *Schema) WithoutAdditionalProperties() *Schema {
-	schema.AdditionalProperties = AdditionalProperties{Has: new(false)}
+	schema.AdditionalProperties = AdditionalProperties{Has: Ptr(false)}
 	return schema
 }
 
diff --git a/openapi3/schema_jsonschema_validator.go b/openapi3/schema_jsonschema_validator.go
@@ -152,8 +152,12 @@ func (v *jsonSchemaValidator) validate(value any) error {
 
 // convertJSONSchemaError converts a jsonschema validation error to OpenAPI SchemaError format
 func convertJSONSchemaError(err error) error {
-	if err, ok := errors.AsType[*jsonschema.ValidationError](err); ok {
-		return formatValidationError(err, "")
+	// TODO: Go 1.26
+	// if err, ok := errors.AsType[*jsonschema.ValidationError](err); ok {
+	// 	return formatValidationError(err, "")
+	var validationErr *jsonschema.ValidationError
+	if errors.As(err, &validationErr) {
+		return formatValidationError(validationErr, "")
 	}
 	return err
 }
diff --git a/openapi3/schema_test.go b/openapi3/schema_test.go
@@ -542,7 +542,7 @@ var schemaExamples = []schemaExample{
 		Schema: &Schema{
 			Type:        &Types{"array"},
 			MinItems:    2,
-			MaxItems:    new(uint64(3)),
+			MaxItems:    Ptr[uint64](3),
 			UniqueItems: true,
 			Items:       NewFloat64Schema().NewRef(),
 		},
@@ -872,7 +872,7 @@ var schemaExamples = []schemaExample{
 		Title: "OBJECT",
 		Schema: &Schema{
 			Type:     &Types{"object"},
-			MaxProps: new(uint64(2)),
+			MaxProps: Ptr[uint64](2),
 			Properties: Schemas{
 				"numberProperty": NewFloat64Schema().NewRef(),
 			},
@@ -944,7 +944,7 @@ var schemaExamples = []schemaExample{
 	{
 		Schema: &Schema{
 			Type:                 &Types{"object"},
-			AdditionalProperties: AdditionalProperties{Has: new(true)},
+			AdditionalProperties: AdditionalProperties{Has: Ptr(true)},
 		},
 		Serialization: map[string]any{
 			"type":                 "object",
diff --git a/openapi3filter/req_resp_decoder_test.go b/openapi3filter/req_resp_decoder_test.go
@@ -21,8 +21,8 @@ import (
 )
 
 var (
-	explode   = new(true)
-	noExplode = new(false)
+	explode   = openapi3.Ptr(true)
+	noExplode = openapi3.Ptr(false)
 	arrayOf   = func(items *openapi3.SchemaRef) *openapi3.SchemaRef {
 		return &openapi3.SchemaRef{Value: &openapi3.Schema{Type: &openapi3.Types{"array"}, Items: items}}
 	}
@@ -1751,7 +1751,7 @@ func TestDecodeBody(t *testing.T) {
 				WithProperty("b", openapi3.NewIntegerSchema()).
 				WithProperty("c", openapi3.NewArraySchema().WithItems(openapi3.NewStringSchema())),
 			encoding: map[string]*openapi3.Encoding{
-				"c": {Style: openapi3.SerializationSpaceDelimited, Explode: new(false)},
+				"c": {Style: openapi3.SerializationSpaceDelimited, Explode: openapi3.Ptr(false)},
 			},
 			want: map[string]any{"a": "a1", "b": int64(10), "c": []any{"c1", "c2"}},
 		},
@@ -1764,7 +1764,7 @@ func TestDecodeBody(t *testing.T) {
 				WithProperty("b", openapi3.NewIntegerSchema()).
 				WithProperty("c", openapi3.NewArraySchema().WithItems(openapi3.NewStringSchema())),
 			encoding: map[string]*openapi3.Encoding{
-				"c": {Style: openapi3.SerializationPipeDelimited, Explode: new(false)},
+				"c": {Style: openapi3.SerializationPipeDelimited, Explode: openapi3.Ptr(false)},
 			},
 			want: map[string]any{"a": "a1", "b": int64(10), "c": []any{"c1", "c2"}},
 		},

Original file line number	Diff line number	Diff line change
`@@ -1348,11 +1348,12 @@ func compareParameters(a, b *openapi2.Parameter) int {`
`1348`	`1348`	`return cmp.Compare(a.Ref, b.Ref)`
`1349`	`1349`	`}`
`1350`	`1350`
	`1351`	`+// boolPtr returns a pointer to a bool, or nil if the value is false (to avoid storing empty values)`
`1351`	`1352`	`func boolPtr(b bool) *bool {`
`1352`		`- if b {`
`1353`		`- return new(b)`
	`1353`	`+ if !b {`
	`1354`	`+ return nil`
`1354`	`1355`	`}`
`1355`		`- return nil`
	`1356`	`+ return &b`
`1356`	`1357`	`}`
`1357`	`1358`
`1358`	`1359`	`// exclusiveBoundToBool converts an ExclusiveBound to a bool for OpenAPI 2.0 compatibility`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func encoding() *Encoding {`
`51`	`51`	`},`
`52`	`52`	`},`
`53`	`53`	`Style: "form",`
`54`		`- Explode: new(true),`
	`54`	`+ Explode: Ptr(true),`
`55`	`55`	`AllowReserved: true,`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -73,17 +73,17 @@ func TestEncodingSerializationMethod(t *testing.T) {`
`73`	`73`	`},`
`74`	`74`	`{`
`75`	`75`	`name: "encoding with explode",`
`76`		`- enc: &Encoding{Explode: new(true)},`
	`76`	`+ enc: &Encoding{Explode: Ptr(true)},`
`77`	`77`	`want: &SerializationMethod{Style: SerializationForm, Explode: true},`
`78`	`78`	`},`
`79`	`79`	`{`
`80`	`80`	`name: "encoding with no explode",`
`81`		`- enc: &Encoding{Explode: new(false)},`
	`81`	`+ enc: &Encoding{Explode: Ptr(false)},`
`82`	`82`	`want: &SerializationMethod{Style: SerializationForm, Explode: false},`
`83`	`83`	`},`
`84`	`84`	`{`
`85`	`85`	`name: "encoding with style and explode ",`
`86`		`- enc: &Encoding{Style: SerializationSpaceDelimited, Explode: new(false)},`
	`86`	`+ enc: &Encoding{Style: SerializationSpaceDelimited, Explode: Ptr(false)},`
`87`	`87`	`want: &SerializationMethod{Style: SerializationSpaceDelimited, Explode: false},`
`88`	`88`	`},`
`89`	`89`	`}`