Skip to content

chore(deps): bump doctrine/orm from 3.6.2 to 3.6.8 in the doctrine group across 1 directory - #7055

Merged
dotani1111 merged 1 commit into
4.4from
dependabot/composer/doctrine-f6862ee762
Sep 10, 2026
Merged

chore(deps): bump doctrine/orm from 3.6.2 to 3.6.8 in the doctrine group across 1 directory#7055
dotani1111 merged 1 commit into
4.4from
dependabot/composer/doctrine-f6862ee762

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Aug 12, 2026

Copy link
Copy Markdown
Contributor

Bumps the doctrine group with 1 update in the / directory: doctrine/orm.

Updates doctrine/orm from 3.6.2 to 3.6.8

Release notes

Sourced from doctrine/orm's releases.

3.6.8

Release Notes for 3.6.8

3.6.8

  • Total issues resolved: 0
  • Total pull requests resolved: 15
  • Total contributors: 5

Bugfixes

Improvements

Static Analysis

Test Suite

3.6.7

This release contains the changes from https://github.com/doctrine/orm/releases/tag/2.20.13

3.6.6

Release Notes for 3.6.6

3.6.x bugfix release (patch)

3.6.6

  • Total issues resolved: 0

... (truncated)

Commits
  • a4d13ed Merge pull request #12545 from greg0ire/3.6.x
  • 0254bc7 Merge remote-tracking branch 'origin/2.20.x' into 3.6.x
  • 6544249 Merge pull request #12491 from demiankatz/fix-issue-11418
  • d9923c2 Merge pull request #12516 from ruudk/fix-lock-mode
  • 8c15dcd Rename variable as per review.
  • 2bae808 Merge pull request #12534 from greg0ire/mocks-stubs
  • 1cebc45 Use stubs when appropriate
  • 0314881 Merge pull request #12532 from greg0ire/towards-phpunit-12
  • 6e78e5d Remove deprecated attribute
  • 4656213 Address deprecation about argument count mismatch
  • Additional commits viewable in compare view

@dependabot dependabot Bot added dependencies Pull requests that update a dependency file php Pull requests that update Php code labels Aug 12, 2026
@dependabot
dependabot Bot force-pushed the dependabot/composer/doctrine-f6862ee762 branch 2 times, most recently from dcb365c to 1e82d0b Compare August 16, 2026 22:02
@ttokoro20240902

Copy link
Copy Markdown
Contributor

CI の 45 ジョブが赤ですが、本体のコード修正は不要です。symfony グループの #7074 を先にマージして本 PR を rebase すれば通ります。

失敗は全ジョブ Setup EC-CUBEdoctrine:schema:create で、テストに到達していません。

The setSchema() method requires the DBAL Schema::edit() API which is not
available in the current DBAL version. This feature requires doctrine/dbal ^4.5 or higher.

setSchema() は orm 3.6.8 で追加されたもので(3.6.7 までは存在しません)、呼んでいるのは symfony/doctrine-bridge の SchemaListener 群です。dbal 4.5 は未リリースですが、dbal を上げる必要はありませんdoctrine/orm#12553 の修正が Symfony 7.4.16 で入り、Schema::edit() が無い環境では setSchema() を呼ばずに従来の in-place 更新へ落ちるようになっています(= 今 orm 3.6.7 で動いている経路)。4.4 の lock は doctrine-bridge が v7.4.15、#7074 が v7.4.16 に上げます

dbal 4.4.4 のまま bridge だけ差し替えて実測しました。

doctrine-bridge 結果
v7.4.15 BadMethodCallException(上記)
v7.4.16 例外なし。schema に lock_keys が載る(差分も失われない)

提案: #7074 をマージ → 本 PR に @dependabot rebase

@dependabot
dependabot Bot force-pushed the dependabot/composer/doctrine-f6862ee762 branch from 1e82d0b to 3dc2d4b Compare August 26, 2026 07:24

@ttokoro20240902 ttokoro20240902 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

doctrine:schema:update --dump-sql を 3.6.2 と 3.6.8 で取って比較し、生成 DDL が完全に一致することを確認しました。3.6.6 の「STI で同じ外部キーを二重に追加しない」修正と 3.6.8 の schema / column editor API 移行は、EC-CUBE のエンティティ集合では DDL に出ません。

3.6.3〜3.6.8 はすべて bugfix リリースで、EC-CUBE に関わりそうなものは次の 3 点です。

  • LockMode::NONE で能動的トランザクションを要求しない (3.6.8)
  • Cache::MODE_REFRESH がクエリキャッシュに書かない問題の修正 (3.6.8)
  • 条件付き join でのコレクション order by の修正 (3.6.4)

CI は 127 pass。base の lock は 3.6.2 なので更新は有効です。

@ttokoro20240902

Copy link
Copy Markdown
Contributor

base が 8/26〜8/28 時点のままで、現在の 4.4 に対して behind が積み上がっています。CI もその時点の base で取った緑なので、再検証のため rebase します。

@dependabot rebase

@dependabot @github

dependabot Bot commented on behalf of github Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@ttokoro20240902

Copy link
Copy Markdown
Contributor

@dependabot rebase は 2026-08-28 の Merge branch '4.4' into dependabot/composer/doctrine-... により拒否されました。
このブランチの手動編集はそのマージコミット 1 本だけで、失って困る変更はありません。
base を現在の 4.4 に合わせるため再生成します。

@dependabot recreate

Bumps the doctrine group with 1 update in the / directory: [doctrine/orm](https://github.com/doctrine/orm).


Updates `doctrine/orm` from 3.6.2 to 3.6.8
- [Release notes](https://github.com/doctrine/orm/releases)
- [Commits](doctrine/orm@3.6.2...3.6.8)

---
updated-dependencies:
- dependency-name: doctrine/orm
  dependency-version: 3.6.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: doctrine
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
dependabot Bot force-pushed the dependabot/composer/doctrine-f6862ee762 branch from 10e7f0b to 4829459 Compare September 3, 2026 05:39
@dotani1111
dotani1111 merged commit abbd98e into 4.4 Sep 10, 2026
246 of 248 checks passed
@dotani1111
dotani1111 deleted the dependabot/composer/doctrine-f6862ee762 branch September 10, 2026 05:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file php Pull requests that update Php code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants