Skip to content

Commit 1c9261e

Browse files
turegjorupclaude
andcommitted
docs: relabel consolidated schema as end-of-2.8 and tighten changelog entries
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent b8dea8d commit 1c9261e

4 files changed

Lines changed: 11 additions & 19 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7-
- Consolidated 25 historical 2.x Doctrine migrations into a single schema-dump migration
8-
representing the end-of-2.7 schema. Upgraders must be on the latest 2.7.x with every migration
9-
applied, then run `doctrine:migrations:rollup` instead of `doctrine:migrations:migrate`. Fresh
10-
installs are unaffected and continue to use `migrate`. See `UPGRADE.md` step 3.
11-
- Restored three previously removed `Template` entity properties (`icon`, `resources`,
12-
`description`) as deprecated, write-only fields with no getters/setters. The columns are kept
13-
in the consolidated 3.0 schema so fresh installs and 2.x → 3.0 upgraders end up with identical
14-
schemas, and Doctrine writes a value on every INSERT (the columns are NOT NULL with no DB
15-
default). The properties and the matching column-drop migration are scheduled for removal in
16-
3.1.
7+
- Consolidated 25 historical 2.x Doctrine migrations into a single end-of-2.8 schema migration; upgraders run `doctrine:migrations:rollup` (see `UPGRADE.md` step 3).
8+
- Restored three deprecated `Template` properties (`icon`, `resources`, `description`) as write-only fields; scheduled for removal in 3.1.
179
- Fixed Calendar and Colibo feed configuration urls and added [] result when no locationEndpoint is set.
1810
- Fixed baked-in `.env` shipping `APP_ENV=dev` in the API image; rewritten to `prod` at build time so
1911
direct reads don't try to bootstrap a dev environment the prod-only dependencies can't satisfy.

UPGRADE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Rename the following .env variables in `.env.local`:
7575

7676
#### 3 - Consolidate Doctrine migrations
7777

78-
3.0 ships a single consolidated migration that represents the end-of-2.7 schema. The 25 historical
78+
3.0 ships a single consolidated migration that represents the end-of-2.8 schema. The 25 historical
7979
2.x migrations have been removed from the repository.
8080

8181
Because every upgrading database already matches that consolidated schema (via the 25 migrations it
@@ -85,7 +85,7 @@ truncates the `doctrine_migration_versions` table and inserts a single row marki
8585
migration as already executed:
8686

8787
```shell
88-
# Confirm the database is at the latest 2.7.x state before rolling up.
88+
# Confirm the database is at the latest 2.8.x state before rolling up.
8989
# All 25 historical versions should appear as "migrated" / "available".
9090
docker compose exec phpfpm bin/console doctrine:migrations:status
9191

@@ -94,9 +94,9 @@ docker compose exec phpfpm bin/console doctrine:migrations:status
9494
docker compose exec phpfpm bin/console doctrine:migrations:rollup --no-interaction
9595
```
9696

97-
> **Prerequisite:** the database must be on the final 2.7.x release with every 2.x migration
98-
> applied. If `doctrine:migrations:status` (run while still on 2.7.x) reports any pending
99-
> migrations, run `doctrine:migrations:migrate` on 2.7.x first, then upgrade to 3.0 and continue
97+
> **Prerequisite:** the database must be on the final 2.8.x release with every 2.x migration
98+
> applied. If `doctrine:migrations:status` (run while still on 2.8.x) reports any pending
99+
> migrations, run `doctrine:migrations:migrate` on 2.8.x first, then upgrade to 3.0 and continue
100100
> here.
101101
102102
Fresh installs (no prior 2.x database) skip the rollup and run

migrations/Version20260506215847.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
use Doctrine\Migrations\AbstractMigration;
99

1010
/**
11-
* Consolidated end-of-2.7 schema.
11+
* Consolidated end-of-2.8 schema.
1212
*
1313
* Replaces the 25 historical 2.x migrations (Version20220309093909 …
1414
* Version20250828084617) with a single migration representing the schema
15-
* everyone is on after the final 2.7.x release.
15+
* everyone is on after the final 2.8.x release.
1616
*
1717
* Includes three columns the 3.0 `Template` entity carries as deprecated,
1818
* write-only fields — `template.icon`, `template.resources`,
@@ -29,7 +29,7 @@ final class Version20260506215847 extends AbstractMigration
2929
{
3030
public function getDescription(): string
3131
{
32-
return 'Consolidated end-of-2.7 schema (replaces all 25 historical 2.x migrations).';
32+
return 'Consolidated end-of-2.8 schema (replaces all 25 historical 2.x migrations).';
3333
}
3434

3535
public function up(Schema $schema): void

src/Entity/Template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Template extends AbstractBaseEntity implements MultiTenantInterface, Relat
3030
/*
3131
* The three properties below ($icon, $resources, $description) are
3232
* carried over from 2.7 with their original mapping and PHP-level
33-
* defaults so the consolidated end-of-2.7 schema matches both fresh
33+
* defaults so the consolidated end-of-2.8 schema matches both fresh
3434
* installs and 2.x → 3.0 upgraders, and so Doctrine emits a value
3535
* for each on every INSERT (the columns are NOT NULL with no DB
3636
* default). They are intentionally write-only here — no getters,

0 commit comments

Comments
 (0)