Skip to content

Backport selected fixes from 2026.x to 5.1#3049

Merged
dpfaffenbauer merged 10 commits into
coreshop:5.1from
dpfaffenbauer:feature/backport-from-2026.x
May 26, 2026
Merged

Backport selected fixes from 2026.x to 5.1#3049
dpfaffenbauer merged 10 commits into
coreshop:5.1from
dpfaffenbauer:feature/backport-from-2026.x

Conversation

@dpfaffenbauer

Copy link
Copy Markdown
Member

Summary

Cherry-picks bug fixes and Studio improvements from 2026.x that are applicable to 5.1. Skips the Pimcore 2026.1 migration (ExtJS removal, PHP 8.5, DBAL 4, install profile, web-to-print drop) and 2026-only CI/workflow changes.

Cherry-picked commits

  • 9dc4dc47ed suppress psalm InvalidArrayOffset in ProportionalIntegerDistributor
  • 40f60158ca add verifyRoute/verifyUrl helpers on SymfonyPage for native Symfony routing
  • 5cea7b8fdf strip Pimcore front controller in Behat page resolvers
  • 7a7e559082 [Index] tighten normalizeTableIndex return to non-empty-list<string> for Psalm
  • eb6d2dd9b1 Bump koa + @module-federation/rsbuild-plugin
  • 4d30c208e2 Add Dependabot configuration for updates
  • f8b0935ca1 Bump postcss
  • 94616aeccd partial backport of b1f1eabd2f "studio fixes" — Studio TSX/TS changes only

The key fix: Order-Creation customer popup

OrderCreationButton previously used useElementSelector hook inside a component rendered through Pimcore's MainNav registry. When menu items get added asynchronously, React attributes the hook to MainNav and crashes with React #310.

The fix switches the menu integration to the useCustomMainNavItem factory pattern and calls getPimcoreStudioApi().element.openElementSelector imperatively (no hooks inside the factory). Also touches AssignToExisting/NewCompanyButton, CustomerSelector, MenuBundle/menu-extension, related ButtonConfig typing, PimcoreBundle/utils/authentication, listing-builders cleanup.

Deliberately skipped

  • 14 Pimcore-2026.1-migration commits (Pimcore/PHP/DBAL bumps, install profile, ExtJS removal, web-to-print drop, etc.)
  • 12 CI/workflow commits (2026-specific Pimcore 12.x matrix split, reusable workflow refactor)
  • 2 docs commits (describe 2026 install profile / ExtJS-free state)
  • 5 Dependabot lockfile-only bumps (axios, fast-uri ×2, babel-plugin, svgo, node-forge) — will be regenerated by npm install

From b1f1eabd2f excluded

ORM XMLs (DBAL 4 native ENUM), 17 bundle package.json Pimcore version bumps, root package.json / config/reference.php / config/bundles.php, ExtJS public-file deletes, local mercure yaml, PimcoreGenericExecutionEngineBundle registration drop.

Test plan

  • npm install to regenerate lockfile
  • Build studio bundles
  • Open admin → menu → "Create Order" → element-selector popup for customer selection appears
  • Run Behat suite with new verifyRoute/verifyUrl helpers
  • vendor/bin/psalm + vendor/bin/phpstan

dpfaffenbauer and others added 10 commits May 26, 2026 20:04
Removes [koa](https://github.com/koajs/koa). It's no longer used after updating ancestor dependency [@module-federation/rsbuild-plugin](https://github.com/module-federation/core/tree/HEAD/packages/rsbuild-plugin). These dependencies need to be updated together.

Removes `koa`

Updates `@module-federation/rsbuild-plugin` from 0.13.1 to 2.4.0
- [Release notes](https://github.com/module-federation/core/releases)
- [Changelog](https://github.com/module-federation/core/blob/main/packages/rsbuild-plugin/CHANGELOG.md)
- [Commits](https://github.com/module-federation/core/commits/v2.4.0/packages/rsbuild-plugin)

---
updated-dependencies:
- dependency-name: koa
  dependency-version:
  dependency-type: indirect
- dependency-name: "@module-federation/rsbuild-plugin"
  dependency-version: 2.4.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4c7b0b7)
Configured Dependabot for version updates with a weekly schedule.

(cherry picked from commit 5901b0c)
Bumps the npm_and_yarn group with 1 update in the /src/CoreShop/Bundle/FrontendBundle/Resources/assets directory: [postcss](https://github.com/postcss/postcss).

Updates `postcss` from 8.4.47 to 8.5.14
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.47...8.5.14)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.14
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit e642b54)
…up + nav-item factory fix

Pick only Studio TSX/TS source changes from 'studio fixes', skip
Pimcore-2026.1-specific config/ORM/bundle/package bumps.

Key fix: OrderCreationButton now uses useCustomMainNavItem factory
+ getPimcoreStudioApi().element.openElementSelector instead of
useElementSelector hook (avoids React coreshop#310 when MainNav adds menu
items asynchronously).
The installed canary (20251119) predates the useCustomMainNavItem
addition. 2025.4.3 is the stable Pimcore-12 line and exposes the
factory-style nav-item API needed by the customer-popup fix.
@sonarqubecloud

Copy link
Copy Markdown

@dpfaffenbauer dpfaffenbauer merged commit 8fced7a into coreshop:5.1 May 26, 2026
214 checks passed
@dpfaffenbauer dpfaffenbauer deleted the feature/backport-from-2026.x branch May 26, 2026 19:11
@github-actions github-actions Bot locked and limited conversation to collaborators May 26, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant