Skip to content

[6.x] Move filesystem URL settings to implementations - #19525

Merged
brandonkelly merged 4 commits into
6.xfrom
rias/cms-2377-restore-base-filesystem-url-settings
Sep 1, 2026
Merged

brandonkelly merged 4 commits into
6.xfrom
rias/cms-2377-restore-base-filesystem-url-settings

Conversation

@riasvdv

@riasvdv riasvdv commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Description

  • Moves hasUrls and url from the base filesystem to Local filesystem settings.
  • Keeps the legacy URL properties, form fields, and visibility flags in the Yii adapter.
  • Migrates existing filesystem project config values into component settings.
  • Uses getRootUrl() to determine URL support across native and legacy filesystems.

@linear-code

linear-code Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

CMS-2377

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown

📚 Storybook previews

@craftcms/uiopen Storybook

No changed components detected in this Storybook.

resources/jsopen Storybook

No changed components detected in this Storybook.

@riasvdv
riasvdv marked this pull request as ready for review September 1, 2026 09:02
…base-filesystem-url-settings

# Conflicts:
#	tests/Feature/Form/ElementSelectControlTest.php
#	tests/Unit/Form/ElementSelectControlTest.php
@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

Merge resolved, committed, and pushed.

Summary for PR review:

Both conflicted files were duplicate work: the branch commit 26d8316 ("Fix element select thumbnail tests") and the 6.x commit 618e973 ("Fix element select tests") are the same author's two passes at the same fix, roughly 90 minutes apart. database/Factories/VolumeFactory.php (fs'disk:local') was identical on both sides and auto-merged.

  • tests/Feature/Form/ElementSelectControlTest.php (2 hunks) — both sides gave the asset dataset a non-image file so the thumbnail doesn't need a transform URL; the branch used file.txt/text, 6.x used document.pdf/pdf. Took the 6.x value in both hunks so the test file stays identical to mainline. Functionally equivalent — either filename satisfies the test's intent.
  • tests/Unit/Form/ElementSelectControlTest.php (1 hunk) — pure test-name wording: renders thumbnails for list and thumbs view modes vs renders a thumbnail for chip view modes. Took the 6.x wording. The dataset rows below it (list/list-inlinetrue) were identical on both sides and merged cleanly.

The resolved files are now byte-for-byte identical to their 6.x versions, so no re-divergence from mainline. Nothing here is ambiguous enough to need a # CONFLICT-REVIEW: marker. Note that vendor/ isn't installed in this checkout, so I could not run the test suite or Pint locally — CI on the branch will cover that.

@brandonkelly
brandonkelly merged commit eb5c789 into 6.x Sep 1, 2026
23 checks passed
@brandonkelly
brandonkelly deleted the rias/cms-2377-restore-base-filesystem-url-settings branch September 1, 2026 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants