Skip to content

Comments

chore: upgrade to doctrine/orm 3#5365

Merged
BacLuc merged 11 commits intoecamp:develfrom
usu:chore/doctrine-orm-3
Jan 2, 2025
Merged

chore: upgrade to doctrine/orm 3#5365
BacLuc merged 11 commits intoecamp:develfrom
usu:chore/doctrine-orm-3

Conversation

@usu
Copy link
Member

@usu usu commented Jun 15, 2024

In the meantime, orm-3 compatibility was merged into main branch of https://github.com/doctrine-extensions/DoctrineExtensions

This PR is opened as draft to test orm-3 and to be ready, once the next version of DoctrineExtension is released

@usu usu added the deploy! Creates a feature branch deployment for this PR label Jun 15, 2024
@github-actions
Copy link

github-actions bot commented Jun 15, 2024

Feature branch deployment currently inactive.

If the PR is still open, you can add the deploy! label to this PR to trigger a feature branch deployment.

@usu
Copy link
Member Author

usu commented Jun 18, 2024

Also blocked by doctrine/migrations#1406

BacLuc
BacLuc previously approved these changes Jul 7, 2024
$this->shouldNotReplaceChildren($result);
}

public function testNormalizeDoesntReplaceWhenTargetEntityIsMissing() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you delete this test?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@usu usu temporarily deployed to feature-branch July 9, 2024 19:05 — with GitHub Actions Inactive
@usu
Copy link
Member Author

usu commented Jul 9, 2024

Blocked by doctrine/migrations#1406

@usu usu temporarily deployed to feature-branch July 9, 2024 19:13 — with GitHub Actions Inactive
@BacLuc BacLuc removed the deploy! Creates a feature branch deployment for this PR label Jul 19, 2024
@pmattmann pmattmann added this to the Improvements (v3.2) milestone Dec 3, 2024
@usu usu added the deploy! Creates a feature branch deployment for this PR label Dec 3, 2024
@usu usu requested review from a team and BacLuc December 3, 2024 20:59
@usu usu marked this pull request as ready for review December 3, 2024 20:59
@usu
Copy link
Member Author

usu commented Dec 3, 2024

Implemented workaround described here:
doctrine/migrations#1406 (comment)

@usu usu temporarily deployed to feature-branch December 3, 2024 21:01 — with GitHub Actions Inactive
@BacLuc BacLuc dismissed their stale review December 17, 2024 21:51

Its from an old state

Copy link
Contributor

@BacLuc BacLuc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, except for an answer for the deleted test.

Tested:
on top of this branch: detects synced schema, everything is fine.

When adding a column to an entity -> missing migration is detected and generated, exit code is not zero for the validation.

When adding a column too much in a migration -> difference is detected, migration to remove column is generated, not zero exit code for validation.

When switching from a database state on devel to this commit:
already at newest migration, nothing happens.

working-directory: api

- run: php bin/console doctrine:schema:validate -v -e test
- run: php bin/console doctrine:schema:validate --skip-sync -e test && php bin/console doctrine:migrations:up-to-date -e test && ! php bin/console doctrine:migrations:diff -e test --namespace DoctrineMigrations
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- run: php bin/console doctrine:schema:validate --skip-sync -e test && php bin/console doctrine:migrations:up-to-date -e test && ! php bin/console doctrine:migrations:diff -e test --namespace DoctrineMigrations
- run: php bin/console doctrine:schema:validate --skip-sync -e test && php bin/console doctrine:migrations:up-to-date -e test && ! php bin/console doctrine:migrations:diff -e test --namespace DoctrineMigrations --silent --allow-empty-migrations

has the non zero exit code but does not show the error banner

testNormalizeDoesntReplaceWhenTargetEntityIsMissing
@BacLuc BacLuc enabled auto-merge January 2, 2025 13:35
@BacLuc BacLuc disabled auto-merge January 2, 2025 13:35
@BacLuc BacLuc temporarily deployed to feature-branch January 2, 2025 13:39 — with GitHub Actions Inactive
…trine-orm-3

# Conflicts:
#	api/composer.json
#	api/composer.lock
@BacLuc BacLuc force-pushed the chore/doctrine-orm-3 branch from 82435fc to c10d591 Compare January 2, 2025 13:40
@BacLuc BacLuc enabled auto-merge January 2, 2025 13:40
@BacLuc BacLuc temporarily deployed to feature-branch January 2, 2025 13:44 — with GitHub Actions Inactive
@BacLuc BacLuc added this pull request to the merge queue Jan 2, 2025
Merged via the queue into ecamp:devel with commit 816e9b2 Jan 2, 2025
31 checks passed
@BacLuc BacLuc mentioned this pull request Jan 14, 2025
@carlobeltrame carlobeltrame mentioned this pull request Jun 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deploy! Creates a feature branch deployment for this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants