Skip to content
Draft

5.13 #20393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
7485913
migrate from our GB administrative areas to addressing library's
i-just Aug 25, 2026
b4dd49c
bumped schema version
i-just Aug 25, 2026
fe3c5b9
Add CHANGELOG-WIP.md for 5.13
brandonkelly Nov 5, 2026
e19cffd
Merge remote-tracking branch 'origin/5.13' into feature/addressing-gb…
brandonkelly Nov 5, 2026
b544811
Update stale GB subdivision comments
brandonkelly Nov 5, 2026
30a31cc
Make GB county migration locale-independent; normalize legacy county …
brandonkelly Nov 5, 2026
1479f8b
Merge remote-tracking branch 'origin/5.x' into tmp-513
brandonkelly Nov 5, 2026
6447fac
Run CI on pushes to 5.13
brandonkelly Nov 5, 2026
bfe4160
Keep labels for selected administrative areas in condition rules
brandonkelly Nov 5, 2026
1158129
Merge pull request #19488 from craftcms/feature/addressing-gb-adminis…
brandonkelly Nov 6, 2026
2e09f46
Merge branch '5.x' into 5.13
brandonkelly Nov 8, 2026
2e4d288
Show DDEV commands when running in DDEV
brandonkelly Nov 8, 2026
e78b483
Merge pull request #20487 from craftcms/feature/ddev-commands
brandonkelly Nov 8, 2026
cc25e1f
New translations app.php (French)
shinybrad Nov 8, 2026
7dabe9d
New translations app.php (Spanish)
shinybrad Nov 8, 2026
3b08eae
New translations app.php (Arabic)
shinybrad Nov 8, 2026
e537118
New translations app.php (Czech)
shinybrad Nov 8, 2026
9b4041e
New translations app.php (Danish)
shinybrad Nov 8, 2026
12d7f5f
New translations app.php (German)
shinybrad Nov 8, 2026
4312b6b
New translations app.php (Greek)
shinybrad Nov 8, 2026
6c3079e
New translations app.php (Hebrew)
shinybrad Nov 8, 2026
c6103fc
New translations app.php (Hungarian)
shinybrad Nov 8, 2026
8c3c880
New translations app.php (Italian)
shinybrad Nov 8, 2026
e3f064a
New translations app.php (Japanese)
shinybrad Nov 8, 2026
bd9b254
New translations app.php (Korean)
shinybrad Nov 8, 2026
bb6a8be
New translations app.php (Dutch)
shinybrad Nov 8, 2026
17a94a3
New translations app.php (Polish)
shinybrad Nov 8, 2026
54a4449
New translations app.php (Portuguese)
shinybrad Nov 8, 2026
081fe16
New translations app.php (Russian)
shinybrad Nov 8, 2026
d32d846
New translations app.php (Slovak)
shinybrad Nov 8, 2026
f19bf67
New translations app.php (Swedish)
shinybrad Nov 8, 2026
2b6e76d
New translations app.php (Turkish)
shinybrad Nov 8, 2026
362cc68
New translations app.php (Ukrainian)
shinybrad Nov 8, 2026
c0a9915
New translations app.php (Chinese Simplified)
shinybrad Nov 8, 2026
14e35ca
New translations app.php (Icelandic)
shinybrad Nov 8, 2026
cb78889
New translations app.php (Persian)
shinybrad Nov 8, 2026
6cebd02
New translations app.php (Thai)
shinybrad Nov 8, 2026
7eb256a
New translations app.php (English, United Kingdom)
shinybrad Nov 8, 2026
ef61545
New translations app.php (French, Canada)
shinybrad Nov 8, 2026
c7f3190
New translations app.php (Norwegian Bokmal)
shinybrad Nov 8, 2026
a48ca8a
New translations app.php (German, Switzerland)
shinybrad Nov 8, 2026
a92ca9b
New translations app.php (French)
shinybrad Nov 8, 2026
517c58b
New translations app.php (Spanish)
shinybrad Nov 8, 2026
4149447
New translations app.php (Arabic)
shinybrad Nov 8, 2026
d47b405
New translations app.php (Czech)
shinybrad Nov 8, 2026
80e267b
New translations app.php (Danish)
shinybrad Nov 8, 2026
14face9
New translations app.php (German)
shinybrad Nov 8, 2026
6c22b82
New translations app.php (Greek)
shinybrad Nov 8, 2026
4150d97
New translations app.php (Hebrew)
shinybrad Nov 8, 2026
dccda0d
New translations app.php (Hungarian)
shinybrad Nov 8, 2026
48dcfd7
New translations app.php (Italian)
shinybrad Nov 8, 2026
2c81a56
New translations app.php (Japanese)
shinybrad Nov 8, 2026
d1c16fa
New translations app.php (Korean)
shinybrad Nov 8, 2026
8a811b0
New translations app.php (Dutch)
shinybrad Nov 8, 2026
8bd9743
New translations app.php (Polish)
shinybrad Nov 8, 2026
8077637
New translations app.php (Portuguese)
shinybrad Nov 8, 2026
6adb5c5
New translations app.php (Russian)
shinybrad Nov 8, 2026
d53d991
New translations app.php (Slovak)
shinybrad Nov 8, 2026
974abf3
New translations app.php (Swedish)
shinybrad Nov 8, 2026
863d32a
New translations app.php (Turkish)
shinybrad Nov 8, 2026
dfc1fa8
New translations app.php (Ukrainian)
shinybrad Nov 8, 2026
0b28a78
New translations app.php (Chinese Simplified)
shinybrad Nov 8, 2026
f4e8695
New translations app.php (Icelandic)
shinybrad Nov 8, 2026
0bf5616
New translations app.php (Persian)
shinybrad Nov 8, 2026
495c6c3
New translations app.php (Thai)
shinybrad Nov 8, 2026
8247e78
New translations app.php (French, Canada)
shinybrad Nov 8, 2026
a1d5af6
New translations app.php (Norwegian Bokmal)
shinybrad Nov 8, 2026
52a1585
New translations app.php (German, Switzerland)
shinybrad Nov 8, 2026
4f801eb
Merge pull request #20489 from craftcms/t9n/5.13
brandonkelly Nov 9, 2026
e128c69
New translations app.php (French)
shinybrad Nov 10, 2026
e6ddd88
New translations app.php (Spanish)
shinybrad Nov 10, 2026
7b75502
New translations app.php (Arabic)
shinybrad Nov 10, 2026
05149e6
New translations app.php (Czech)
shinybrad Nov 10, 2026
208106b
New translations app.php (Danish)
shinybrad Nov 10, 2026
07d1ca1
New translations app.php (German)
shinybrad Nov 10, 2026
d832a4d
New translations app.php (Greek)
shinybrad Nov 10, 2026
c6fe1fe
New translations app.php (Hebrew)
shinybrad Nov 10, 2026
b28c172
New translations app.php (Hungarian)
shinybrad Nov 10, 2026
677df63
New translations app.php (Italian)
shinybrad Nov 10, 2026
a1a8110
New translations app.php (Japanese)
shinybrad Nov 10, 2026
5a08a06
New translations app.php (Korean)
shinybrad Nov 10, 2026
cff09f5
New translations app.php (Dutch)
shinybrad Nov 10, 2026
e741d0c
New translations app.php (Polish)
shinybrad Nov 10, 2026
ba7ef9f
New translations app.php (Portuguese)
shinybrad Nov 10, 2026
85f86e8
New translations app.php (Russian)
shinybrad Nov 10, 2026
d7e4637
New translations app.php (Slovak)
shinybrad Nov 10, 2026
4732389
New translations app.php (Swedish)
shinybrad Nov 10, 2026
622a4a8
New translations app.php (Turkish)
shinybrad Nov 10, 2026
e5e257f
New translations app.php (Ukrainian)
shinybrad Nov 10, 2026
54ee36a
New translations app.php (Chinese Simplified)
shinybrad Nov 10, 2026
1820f22
New translations app.php (Icelandic)
shinybrad Nov 10, 2026
0ae9e69
New translations app.php (Persian)
shinybrad Nov 10, 2026
488fab7
New translations app.php (Thai)
shinybrad Nov 10, 2026
3e18c49
New translations app.php (French, Canada)
shinybrad Nov 10, 2026
8fba662
New translations app.php (Norwegian Bokmal)
shinybrad Nov 10, 2026
baa485a
New translations app.php (German, Switzerland)
shinybrad Nov 10, 2026
a3037a8
Merge pull request #20550 from craftcms/t9n/5.13
brandonkelly Nov 10, 2026
68acf77
Require system Composer for package management
riasvdv Nov 11, 2026
9a55e93
Initialize nullable updater test state
riasvdv Nov 11, 2026
abd0a13
Add X-Craft-Gql-Token header for GraphQL tokens
brandonkelly Nov 12, 2026
be0844c
Vary GraphQL cache keys by the session user too
brandonkelly Nov 12, 2026
f95c170
Log the access token's user in for X-Craft-Gql-Token requests
brandonkelly Nov 12, 2026
5f5d9bb
Vary GraphQL cache keys by the logged-in user's permissions
brandonkelly Nov 12, 2026
0d472a7
Merge branch '5.x' into 5.13
brandonkelly Nov 12, 2026
5e3a2fe
Merge pull request #20622 from craftcms/feature/gql-token-header
brandonkelly Nov 12, 2026
1c726e2
Merge branch '5.x' into 5.13
brandonkelly Nov 12, 2026
11bb67f
Merge branch '5.13' into fix/system-composer
riasvdv Nov 13, 2026
a6eedf8
Cache Composer UI checks and expose disabled menu actions
riasvdv Nov 13, 2026
4343594
Test system Composer launchers on Windows
riasvdv Nov 13, 2026
3554c23
Enable required PHP extensions for Windows tests
riasvdv Nov 13, 2026
0f62717
Speed up unique() element queries on PostgreSQL
brandonkelly Nov 13, 2026
9034954
Changelog for #20675
brandonkelly Nov 13, 2026
dc7ec64
Merge pull request #20675 from craftcms/bugfix/pgsql-unique-distinct-on
brandonkelly Nov 14, 2026
ad841d0
Merge branch '5.x' into 5.13
brandonkelly Nov 14, 2026
da1d8e9
Merge pull request #20611 from craftcms/fix/system-composer
brandonkelly Nov 14, 2026
2d6a015
New translations app.php (French)
shinybrad Nov 14, 2026
3efb88e
New translations app.php (Spanish)
shinybrad Nov 14, 2026
3ca2718
New translations app.php (Arabic)
shinybrad Nov 14, 2026
26c21bc
New translations app.php (Czech)
shinybrad Nov 14, 2026
1fc0117
New translations app.php (Danish)
shinybrad Nov 14, 2026
df5b0f1
New translations app.php (German)
shinybrad Nov 14, 2026
0cab147
New translations app.php (Greek)
shinybrad Nov 14, 2026
aa2a6eb
New translations app.php (Hebrew)
shinybrad Nov 14, 2026
1ea5128
New translations app.php (Hungarian)
shinybrad Nov 14, 2026
5a2dfc2
New translations app.php (Italian)
shinybrad Nov 14, 2026
d717ae9
New translations app.php (Japanese)
shinybrad Nov 14, 2026
21dfe6e
New translations app.php (Korean)
shinybrad Nov 14, 2026
c747422
New translations app.php (Dutch)
shinybrad Nov 14, 2026
1e6886e
New translations app.php (Polish)
shinybrad Nov 14, 2026
fea53e4
New translations app.php (Portuguese)
shinybrad Nov 14, 2026
8f851d1
New translations app.php (Russian)
shinybrad Nov 14, 2026
f604406
New translations app.php (Slovak)
shinybrad Nov 14, 2026
99053fe
New translations app.php (Swedish)
shinybrad Nov 14, 2026
f89d3e7
New translations app.php (Turkish)
shinybrad Nov 14, 2026
23025f8
New translations app.php (Ukrainian)
shinybrad Nov 14, 2026
3cb98d8
New translations app.php (Chinese Simplified)
shinybrad Nov 14, 2026
5a90007
New translations app.php (Icelandic)
shinybrad Nov 14, 2026
6f6bf54
New translations app.php (Persian)
shinybrad Nov 14, 2026
7d48a33
New translations app.php (Thai)
shinybrad Nov 14, 2026
afe01f0
New translations app.php (English, United Kingdom)
shinybrad Nov 14, 2026
e8fad81
New translations app.php (French, Canada)
shinybrad Nov 14, 2026
44a7641
New translations app.php (Norwegian Bokmal)
shinybrad Nov 14, 2026
64ed804
New translations app.php (German, Switzerland)
shinybrad Nov 14, 2026
6d65b1f
Merge branch '5.x' into 5.13
brandonkelly Nov 14, 2026
f7e0ffb
Show Craft commands for the current environment in console output
brandonkelly Nov 14, 2026
b69814a
Link the changelog entry to #20702
brandonkelly Nov 14, 2026
c0480a6
Merge pull request #20702 from craftcms/bugfix/craft-command-strings
brandonkelly Nov 14, 2026
856e6f3
Merge pull request #20694 from craftcms/t9n/5.13
brandonkelly Nov 15, 2026
80e9b1a
Merge remote-tracking branch 'origin/5.x' into 5.13
timkelty Nov 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 5.x
- '5.13'
- '*-internal'
pull_request:
permissions:
Expand All @@ -12,6 +13,31 @@ concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true
jobs:
composer-windows:
name: Composer on Windows
runs-on: windows-2022
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
extensions: bcmath,curl,dom,fileinfo,gd,imagick,intl,mbstring,pdo_mysql,sodium,zip
coverage: none
tools: composer:v2
- uses: shogo82148/actions-setup-mysql@00c22a3f5d8beda901ed37debc6ea0f120642ebd # v1
with:
mysql-version: '8.0'
- name: Prepare database
run: |
mysql --host=127.0.0.1 --user=root --execute="CREATE DATABASE craft_test"
Copy-Item tests/.env.example.mysql tests/.env
- name: Install dependencies
run: |
composer config version 5.x-dev
composer install --no-interaction --no-progress
- name: Test Composer launchers
run: php vendor/bin/codecept run unit services/ComposerTest.php --no-colors
ci:
name: ci
uses: craftcms/.github/.github/workflows/ci.yml@v3
Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Release Notes for Craft CMS 5.13 (WIP)

### Addresses

- United Kingdom administrative areas (counties) now come from `commerceguys/addressing`, and are stored by their ISO codes rather than their names. Existing UK addresses are migrated automatically, and Administrative Area condition rules that reference county names are normalized to the new codes. ([#19488](https://github.com/craftcms/cms/pull/19488))
- `craft\services\Addresses::getUsedFields()` and `getUsedSubdivisionFields()` now remove duplicate fields added by event handlers. ([#19488](https://github.com/craftcms/cms/pull/19488))

### Administration

- Craft no longer bundles Composer. Installing, updating, and removing Composer packages now requires Composer 2.2 or later to be installed and available in the PHP process’s `PATH` environment variable. Control panel package installation and updating are disabled when Composer is unavailable; update information and management of already-downloaded plugins remain available.
- Terminal commands shown in the control panel and console output for the current environment now use `ddev craft` and `ddev composer` when Craft is running in DDEV, including the Plugin Store’s installation instructions and the OAuth signing key instructions on the **Settings** → **MCP** and **My Account** → **Tokens** screens. The Plugin Store no longer shows separate “Shell” and “DDEV” tabs. ([#20487](https://github.com/craftcms/cms/pull/20487))
- Commands suggested by the `entrify/*`, `entry-types/merge`, `fields/merge`, `fields/auto-merge`, `setup`, `setup/welcome`, and `update` console commands now use `ddev craft` when Craft is running in DDEV, and `php craft` otherwise. ([#20702](https://github.com/craftcms/cms/pull/20702))

### Development

- Added the `craftCommand()` Twig function. ([#20487](https://github.com/craftcms/cms/pull/20487))
- GraphQL API requests can now pass a GraphQL token via an `X-Craft-Gql-Token` header. When the `Authorization` header also contains a user’s OAuth access token or personal access token, the GraphQL token determines the schema, and the user is logged in for the request, so queries with `withProvisionalDrafts` swap in their provisional drafts. ([#20587](https://github.com/craftcms/cms/issues/20587))

### Extensibility

- Added `craft\services\Composer::MIN_VERSION`, `getIsAvailable()`, `getIsAvailableForUi()`, and `getUnavailableReason()`.
- Added `craft\helpers\App::composerCommand()`. ([#20487](https://github.com/craftcms/cms/pull/20487))
- Added `craft\helpers\App::craftCommand()`. ([#20487](https://github.com/craftcms/cms/pull/20487))
- Added `craft\helpers\App::isDdev()`. ([#20487](https://github.com/craftcms/cms/pull/20487))
- Added `craft\helpers\ElementHelper::getProvisionalDraftUser()`. ([#20587](https://github.com/craftcms/cms/issues/20587))

### Performance

- Improved the performance of element queries that use `unique()` on PostgreSQL. ([#20675](https://github.com/craftcms/cms/pull/20675))

### Dependencies

- Updated `commerceguys/addressing` to v2.3. ([#19488](https://github.com/craftcms/cms/pull/19488))
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ext-pdo": "*",
"ext-zip": "*",
"bacon/bacon-qr-code": "^3.0",
"commerceguys/addressing": "^2.1.1",
"commerceguys/addressing": "^2.3.0",
"composer/semver": "^3.3.2",
"craftcms/plugin-installer": "~1.6.0",
"craftcms/server-check": "~5.1.0",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed lib/composer.phar
Binary file not shown.
6 changes: 3 additions & 3 deletions src/addresses/SubdivisionRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

/**
* Craft's extension of the commerceguys/addressing SubdivisionRepository.
* Its main purpose is to allow addition of data that's not returned by the commerceguys/addressing library,
* like the GB counties data. It also triggers an event which allows developers to modify the subdivisions further.
* Its main purpose is to allow addition of data that's not returned by the commerceguys/addressing library.
* It also triggers an event which allows developers to modify the subdivisions further.
*
* @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
* @since 4.5.0
Expand All @@ -29,7 +29,7 @@ public function getList(array $parents, $locale = null): array
// get the list of subdivisions from commerceguys/addressing
$options = parent::getList($parents, Craft::$app->language);

// if the list is empty (like in case of GB), get the extra options from our files
// if the list is empty, get the extra options from our files
if (empty($options)) {
$options = $this->_getExtraOptions($parents, Craft::$app->language);
}
Expand Down
Loading
Loading