Merge/port recent changes from main into 5.x #1573

pjcdawkins · 2025-10-19T15:02:35Z

No description provided.

Increase the default limits for finding activities

Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](go-chi/chi@v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.2.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Remove "deploy" alias from env:deploy command

…ot allowed (#1553) * Changing instance count on services where autoscaling is enabled is not allowed * Move instance count autoscaling validation earlier --------- Co-authored-by: Ricardo Kirkner <[email protected]> Co-authored-by: Patrick Dawkins <[email protected]>

…g is not available (#1558) Co-authored-by: Ricardo Kirkner <[email protected]>

…1557)

…2025-09-23

Avoid writing to stdout when opening a URL

Co-authored-by: Patrick Dawkins <[email protected]>

…rces (#1546)

(This method is not yet used, but it will be used by a pending PR)

…t cannot be fetched

…-activate Fix "This environment is inactive" during activation if the deployment cannot be fetched

* Add support for organization types to the `orgs` command * Add support for organization types to the `org:create` command * Pass the type on creation * Allow org types to be disabled in the environment * Display the org type in the project:list (projects) command * Re-title project:list columns and display the org label by default, for neater layout * Preserve organization name as the default column * Fix current test expectations * Add unit tests covering org types * Add an --org-type filter to the project list command * Fix golangci-lint in Actions * Update help_test.go

Set --fail-with-body by default in curl commands

Co-authored-by: Ricardo Kirkner <[email protected]>

…rmat

- Add array type annotations to method parameters and return types - Fix QuestionHelper::choose() parameter types in AutoscalingSettingsSetCommand - Change config->get() to config->getInt() for cache TTL parameter - Add missing use statements to ResourcesCommandBase - Make formatCPUType() defensive for optional cpu_type field

pjcdawkins · 2025-10-20T22:28:00Z

Port Verification Analysis (by Claude)

I've systematically examined the differences between the main branch (since v4.22.0) and this port-4.x-5.x branch.

Result: All 71 commits from v4.22.0..main are successfully reflected in this branch.

Commit Distribution

Main branch (v4.22.0 to v4.27.0): 71 commits total
- 29 commits: v4.22.0 to v4.23.0 (tests, CI, Valkey, console rename, auth refresh, etc.)
- 42 commits: v4.23.0 to v4.27.0 (deploy commands, autoscaling, guaranteed resources, etc.)
Port branch structure:
- Based on 5.x at commit dbe0dec (which already included the 29 older commits)
- Merged main (v4.27.0) with commit 874e82b
- Added 8 commits for 5.x adaptation with proper dependency injection and PHP 8+ features

Key Features Verified Present

✅ Valkey support (Add Valkey support (4.x) #1522)
✅ Console command rename (Rename "web" command to "console" #1523)
✅ 401 auth token refresh in curl (Refresh token and retry request on 401, in :curl commands #1516)
✅ Legacy version warning (Show "(legacy)" in the version output, if not wrapped #1520)
✅ Autoscaling settings (get/set commands)
✅ Environment deploy commands (deploy, deploy:type)
✅ Guaranteed resources support
✅ Organization types support
✅ Staged activities support
✅ All Go integration tests
✅ All CI/CD improvements
✅ All dependency updates

Architecture Adaptations

The porting commits show proper adaptation to 5.x architecture:

Reduced code complexity through better service abstractions
Proper use of Symfony dependency injection
PHP 8 type declarations throughout
Symfony 7 compatibility

Conclusion: The port is complete and comprehensive. All functionality from main has been successfully ported and adapted to the 5.x architecture.

pjcdawkins and others added 30 commits March 12, 2025 19:43

Release v4.23.0

2b667e5

Add mark_unwrapped_legacy config option

b4bd0f9

Update Go test dependencies (#1533)

514bbcb

Stop bypassing the organization endpoint for subscriptions (#1532)

ac5cce2

Increase the default limits for finding activities

5b16579

Add environment deploy command and staged activities (#1530)

b1618a4

Merge pull request #1539 from platformsh/bump-activity-default-limits

53306b0

Increase the default limits for finding activities

fix activity result breaks (#1541)

8d4db4e

Guaranteed resources support. (#1531)

6b2c7a4

Remove "deploy" alias from env:deploy command

4b42242

Merge pull request #1545 from platformsh/env-deploy-remove-alias

ec7226c

Remove "deploy" alias from env:deploy command

Add an environment:deploy:type command

ac82212

Add read-only "deployment_type" to env:info (#1540)

3691a50

Release v4.24.0

aaef1b8

Fix Drush site URL when there is no app route (e.g. with Varnish)

c1ad124

Initial support for listing environment autoscaling settings (#1549)

5dd0a3b

Fix command recommendation when there are staged activities

1fc6d1d

fix: let getAutoscalingSettings return empty settings when autoscalin…

edf0fe6

…g is not available (#1558) Co-authored-by: Ricardo Kirkner <[email protected]>

Allow strategy for environment deploy command (#1559)

795cd72

Include a badge next to the service name when autoscaling is enabled (#…

5b9701d

…1557)

Treat upsun and platfomsh vendors as equivalent in project list from …

8ac92ee

…2025-09-23

Avoid writing to stdout when opening a URL

b03cfd1

Merge pull request #1561 from platformsh/url-open-avoid-writing-stdout

88a244c

Avoid writing to stdout when opening a URL

Add e:deploy as alias to environment:deploy (#1560)

e290d42

feat: enable otlp integration (#1543)

e4f9c58

Co-authored-by: Patrick Dawkins <[email protected]>

Update embedded docs links to new permalink structure (#1555)

23f5c02

Show confirmation message on env branch/activate for guaranteed resou…

2989288

…rces (#1546)

Fix PHP < 7 compatibility (for this branch) in Api.php

d0a09e3

(This method is not yet used, but it will be used by a pending PR)

pjcdawkins and others added 20 commits September 10, 2025 16:42

Release v4.25.0

d258bbe

Add 'deploy' alias for env:deploy

176dc4c

Add autoscaling:set command to configure CPU-based autoscaling

abb87d2

Fix "This environment is inactive" during activation if the deploymen…

d0b1eb7

…t cannot be fetched

Merge pull request #1563 from platformsh/fix-gc-causes-state-issue-on…

937ddf6

…-activate Fix "This environment is inactive" during activation if the deployment cannot be fetched

Release v4.26.0

c50db92

feat: rename otlp integration (#1567)

ffd1e65

Set --fail-with-body by default in curl commands

9c68b65

Merge pull request #1569 from platformsh/curl-fail-with-body

e72fd23

Set --fail-with-body by default in curl commands

feat: support memory as a trigger for autoscaling (#1564)

1c9d58a

Co-authored-by: Ricardo Kirkner <[email protected]>

Release v4.27.0

8221419

Merge 4.x into 5.x, with basic conflict resolution

874e82b

Port autoscaling settings and guaranteed resources commands to 5.x fo…

67e0385

…rmat

Port deploy-related changes to 5.x format

fe5bd02

Various 5.x porting changes

9bf9915

Apply PHP CS Fixer

38ba0c5

Apply some phpstan fixes

2865e6d

Fix more phpstan lint errors

8904683

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge/port recent changes from main into 5.x #1573

Merge/port recent changes from main into 5.x #1573

Uh oh!

pjcdawkins commented Oct 19, 2025

Uh oh!

pjcdawkins commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Merge/port recent changes from main into 5.x #1573

Are you sure you want to change the base?

Merge/port recent changes from main into 5.x #1573

Uh oh!

Conversation

pjcdawkins commented Oct 19, 2025

Uh oh!

pjcdawkins commented Oct 20, 2025

Port Verification Analysis (by Claude)

Commit Distribution

Key Features Verified Present

Architecture Adaptations

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants