Fix ZHA config entries using a URI without a port

[puddly]

Proposed change

ZHA had an undocumented default TCP port for socket:// URIs. This changed in 2026.5.0 with the new serial library migration and it looks like some people managed to use it by accident, causing startup to fail. This PR does a data migration and automatically adds the correct port number.

There was a cleanup task scheduled for removal in 2023.11.0 that was affecting tests so I've cleaned that up as well.

Type of change

• Dependency upgrade
• Bugfix (non-breaking change which fixes an issue)
• New integration (thank you!)
• New feature (which adds functionality to an existing integration)
• Deprecation (breaking change to happen in the future)
• Breaking change (fix/feature causing existing functionality to break)
• Code quality improvements to existing code or addition of tests

Additional information

• This PR fixes or closes issue: fixes Update to 2026.5.1-2 fails to start ZHA #170938
• This PR is related to issue:
• Link to documentation pull request:
• Link to developer documentation pull request:
• Link to frontend pull request:

Checklist

• I understand the code I am submitting and can explain how it works.
• The code change is tested and works locally.
• Local tests pass. Your PR cannot be merged unless tests pass
• There is no commented out code in this PR.
• I have followed the development checklist
• I have followed the perfect PR recommendations
• The code has been formatted using Ruff (ruff format homeassistant tests)
• Tests have been added to verify that the new code works.
• Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

• Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

• The manifest file has all fields filled out correctly.
  Updated and included derived files by running: python3 -m script.hassfest.
• New or updated dependencies have been added to requirements_all.txt.
  Updated by running python3 -m script.gen_requirements_all.
• For the updated dependencies a diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

• I have reviewed two other open pull requests in this repository.

[home-assistant]

Hey there @dmulcahey, @Adminiuga, @TheJulianJES, mind taking a look at this pull request as it has been labeled with an integration (zha) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of zha can trigger bot actions by commenting:

• @home-assistant close Closes the pull request.
• @home-assistant mark-draft Mark the pull request as draft.
• @home-assistant ready-for-review Remove the draft status from the pull request.
• @home-assistant rename Awesome new title Renames the pull request.
• @home-assistant reopen Reopen the pull request.
• @home-assistant unassign zha Removes the current integration label and assignees on the pull request, add the integration domain after the command.
• @home-assistant update-branch Update the pull request branch with the base branch.
• @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
• @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

[Copilot]

Pull request overview

This PR updates the ZHA integration’s config entry migration to automatically add an explicit default port (6638) for socket:// / tcp:// device URIs that omit a port, restoring compatibility for setups that previously relied on an undocumented default.

Changes:

• Add a v5 minor-version migration that appends :6638 to socket:// and tcp:// device paths when no port is explicitly set.
• Introduce LEGACY_ZEROCONF_PORT in zha.const and bump the config flow minor version to 5.2.
• Remove the legacy serial path “cleaning” logic and update tests to cover the new migration behavior.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
homeassistant/components/zha/__init__.py	Adds a v5 minor migration to ensure socket:// / tcp:// paths have an explicit port.
homeassistant/components/zha/config_flow.py	Imports the shared legacy port constant and bumps MINOR_VERSION to 2.
homeassistant/components/zha/const.py	Defines LEGACY_ZEROCONF_PORT = 6638 for reuse across ZHA.
homeassistant/components/zha/helpers.py	Removes deprecated serial path cleaning/update logic previously executed during config creation.
tests/components/zha/test_init.py	Replaces older URI-cleaning test coverage with a new test validating the explicit-port migration.

[Copilot]

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

[frenck]

Thanks, @puddly 👍

../Frenck

                       

Blogging my personal ramblings at frenck.dev

[TheJulianJES]

One note about (incorrectly) blocking downgrades from newer minor versions: