fix: github actions

Author: matoous

.github/workflows/ci.yaml

@@ -7,12 +7,12 @@ on:
   workflow_dispatch: {}
   push:
     branches:
-      - master
+      - main
     tags:
       - v[0-9]+.[0-9]+.[0-9]+*
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   lint:
@@ -24,7 +24,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.31.0
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: intl
           coverage: none
 
@@ -43,7 +43,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.31.0
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
           tools: composer:v2
 
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.2']
+        php: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
@@ -82,7 +82,7 @@ jobs:
   release-please:
     name: Prepare release
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     permissions:
       contents: write
       pull-requests: write

.github/workflows/codegen.yaml

@@ -3,13 +3,13 @@ name: Codegen CI
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "codegen/**"
       - ".github/workflows/codegen.yaml"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "codegen/**"
       - ".github/workflows/codegen.yaml"

Makefile

@@ -4,8 +4,6 @@
 help: ## Show help
 	@grep -Eh '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-export PHPDOCUMENTOR_VERSION := v3.0.0
-
 .PHONY: vendor
 vendor: composer.json ## Install dependencies
 	composer install
@@ -20,7 +18,7 @@ fmtcheck: vendor ## Check code formatting
 
 .PHONY: docs
 docs: vendor ## Generate API reference using phpDocumentor
-	docker run --rm -v "$(pwd):/data" "phpdoc/phpdoc:3"
+	docker run --rm -v "$(CURDIR):/data" "phpdoc/phpdoc:3"
 
 .PHONY: test
 test: vendor ## Run PHPUnit test suite

codegen/.golangci.yml

@@ -0,0 +1,25 @@
+version: "2"
+linters:
+  default: standard
+issues:
+  max-same-issues: 0
+  max-issues-per-linter: 0
+  uniq-by-line: true
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/sumup/sumup-py/codegen)
+        - dot
+    gofmt:
+      simplify: true
+    goimports:
+      local-prefixes:
+        - github.com/sumup/sumup-py/codegen
+  exclusions:
+    generated: lax

codegen/Makefile

@@ -0,0 +1,40 @@
+# Make this makefile self-documented with target `help`
+.PHONY: help
+.DEFAULT_GOAL := help
+help: ## Show help
+	@grep -Eh '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: fmt
+fmt: ## Format go files
+	golangci-lint fmt -v
+
+.PHONY: lint
+lint: ## Lint go files
+	golangci-lint run -v
+
+.PHONY: test
+test: ## Run tests
+	go test -v -failfast -race -timeout 10m ./...
+
+.PHONY: download
+download:
+	@echo Download go.mod dependencies
+	@go mod download
+
+.PHONE: vulncheck
+vulncheck: ## Check for Vulnerabilities (make sure you have the tools install: `make install-tools`)
+	govulncheck ./...
+
+.PHONY: install
+install: ## Install latest version of py-sdk-gen
+	go install ./cmd/py-sdk-gen/...
+
+.PHONY: generate
+generate: ## Generate all test files
+	@set -e
+	find ./tests -type f -name 'go.mod' -execdir sh -c 'go generate ./...' \;
+
+.PHONY: update-examples
+update-examples: ## Update all examples
+	@set -e
+	find ./examples -type f -name 'Makefile' -execdir sh -c 'make' \;

codegen/pkg/generator/generator.go

@@ -262,21 +262,23 @@ func (g *Generator) buildPHPEnum(enum enumDefinition) string {
 	}
 
 	backingType := ""
-	if enum.Type == "string" {
+	switch enum.Type {
+	case "string":
 		backingType = ": string"
-	} else if enum.Type == "int" {
+	case "int":
 		backingType = ": int"
 	}
 
 	fmt.Fprintf(&buf, "enum %s%s\n{\n", enum.Name, backingType)
 
 	for _, value := range enum.Values {
 		caseName := phpEnumCaseName(value)
-		if enum.Type == "string" {
+		switch enum.Type {
+		case "string":
 			fmt.Fprintf(&buf, "    case %s = '%s';\n", caseName, value)
-		} else if enum.Type == "int" {
+		case "int":
 			fmt.Fprintf(&buf, "    case %s = %s;\n", caseName, value)
-		} else {
+		default:
 			fmt.Fprintf(&buf, "    case %s;\n", caseName)
 		}
 	}

codegen/pkg/generator/names.go

@@ -48,19 +48,19 @@ func phpEnumName(schemaName, propertyName string) string {
 	propertyName = strings.TrimSpace(propertyName)
 	propertyName = strings.ReplaceAll(propertyName, "-", "_")
 	propertyName = strings.ReplaceAll(propertyName, ".", "_")
-	
+
 	baseName := strcase.ToCamel(propertyName)
 	return schemaName + baseName
 }
 
 func phpEnumCaseName(value string) string {
 	value = strings.TrimSpace(value)
-	
+
 	// Handle numeric values or values that start with numbers
 	if len(value) > 0 && value[0] >= '0' && value[0] <= '9' {
 		value = "VALUE_" + value
 	}
-	
+
 	// Replace common separators and special characters
 	value = strings.ReplaceAll(value, "+", "_PLUS_")
 	value = strings.ReplaceAll(value, "-", "_")
@@ -80,21 +80,21 @@ func phpEnumCaseName(value string) string {
 	value = strings.ReplaceAll(value, ",", "_")
 	value = strings.ReplaceAll(value, "'", "_")
 	value = strings.ReplaceAll(value, "\"", "_")
-	
+
 	// Convert to screaming snake case
 	value = strcase.ToScreamingSnake(value)
-	
+
 	// Clean up multiple underscores
 	for strings.Contains(value, "__") {
 		value = strings.ReplaceAll(value, "__", "_")
 	}
-	
+
 	// Ensure it doesn't start with underscore (unless it's a special value)
 	value = strings.TrimLeft(value, "_")
-	
+
 	if value == "" {
 		return "EMPTY"
 	}
-	
+
 	return value
 }

codegen/pkg/generator/sumup.go

@@ -12,11 +12,13 @@ import (
 	"github.com/iancoleman/strcase"
 )
 
+//nolint:unused // retained for future SumUp class generation
 var reservedServiceNames = map[string]struct{}{
 	"Authorization": {},
 	"Custom":        {},
 }
 
+//nolint:unused // writeSumUpClass is kept for the legacy SumUp SDK surface
 func (g *Generator) writeSumUpClass() error {
 	dir := g.cfg.Out
 	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
@@ -225,6 +227,7 @@ class SumUp
 	return nil
 }
 
+//nolint:unused // helper is used when SumUp class generation is re-enabled
 func (g *Generator) collectServiceDefinitions() []string {
 	if len(g.operationsByTag) == 0 {
 		return nil
@@ -255,6 +258,7 @@ func (g *Generator) collectServiceDefinitions() []string {
 	return services
 }
 
+//nolint:unused // helper for the SumUp class code generation
 func sumUpUseStatements(serviceNames []string) []string {
 	uses := []string{
 		"SumUp\\Application\\ApplicationConfiguration",
@@ -282,6 +286,7 @@ func sumUpUseStatements(serviceNames []string) []string {
 	return append(uses, serviceUses...)
 }
 
+//nolint:unused // helper for generating the SumUp class docblocks
 func renderSumUpPropertyDocs(serviceNames []string) string {
 	if len(serviceNames) == 0 {
 		return ""
@@ -296,6 +301,7 @@ func renderSumUpPropertyDocs(serviceNames []string) string {
 	return buf.String()
 }
 
+//nolint:unused // helper for generating the SumUp class service map
 func renderSumUpServiceMap(serviceNames []string) string {
 	if len(serviceNames) == 0 {
 		return ""