From d2803490d118ca604ba73c6832fbd1467d08e3f2 Mon Sep 17 00:00:00 2001 From: open-dxp-stack Date: Thu, 28 Aug 2025 14:08:53 +0200 Subject: [PATCH 1/3] Update skeleton to comply with admin-bundle as core dependency --- composer.json | 8 ++++---- config/bundles.php | 22 +++++++++++----------- config/routes.yaml | 2 +- src/Kernel.php | 11 ----------- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index 1baa87f..eb095cd 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ "require": { "open-dxp/opendxp": "*", "open-dxp/admin-ui-classic-bundle": "*", - "symfony/dotenv": "^6.4", - "symfony/runtime": "^6.4" + "symfony/dotenv": "^7.3", + "symfony/runtime": "^7.3" }, "require-dev": { - "codeception/codeception": "5.2.2", - "codeception/module-symfony": "^3.1.0", + "codeception/codeception": "^5.3.0", + "codeception/module-symfony": "^3.6.0", "wikimedia/composer-merge-plugin": "^2.1" }, "suggest": { diff --git a/config/bundles.php b/config/bundles.php index ecb408e..092a9c5 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -1,15 +1,15 @@ ['all' => true], - OpenDxp\Bundle\CustomReportsBundle\OpenDxpCustomReportsBundle::class => ['all' => true], - OpenDxp\Bundle\GlossaryBundle\OpenDxpGlossaryBundle::class => ['all' => true], - OpenDxp\Bundle\SeoBundle\OpenDxpSeoBundle::class => ['all' => true], - OpenDxp\Bundle\SimpleBackendSearchBundle\OpenDxpSimpleBackendSearchBundle::class => ['all' => true], - OpenDxp\Bundle\StaticRoutesBundle\OpenDxpStaticRoutesBundle::class => ['all' => true], - OpenDxp\Bundle\TinymceBundle\OpenDxpTinymceBundle::class => ['all' => true], - OpenDxp\Bundle\UuidBundle\OpenDxpUuidBundle::class => ['all' => true], - OpenDxp\Bundle\WordExportBundle\OpenDxpWordExportBundle::class => ['all' => true], - OpenDxp\Bundle\XliffBundle\OpenDxpXliffBundle::class => ['all' => true], - OpenDxp\Bundle\GenericExecutionEngineBundle\OpenDxpGenericExecutionEngineBundle::class => ['all' => true], + \OpenDxp\Bundle\ApplicationLoggerBundle\OpenDxpApplicationLoggerBundle::class => ['all' => true], + \OpenDxp\Bundle\CustomReportsBundle\OpenDxpCustomReportsBundle::class => ['all' => true], + \OpenDxp\Bundle\GlossaryBundle\OpenDxpGlossaryBundle::class => ['all' => true], + \OpenDxp\Bundle\SeoBundle\OpenDxpSeoBundle::class => ['all' => true], + \OpenDxp\Bundle\SimpleBackendSearchBundle\OpenDxpSimpleBackendSearchBundle::class => ['all' => true], + \OpenDxp\Bundle\StaticRoutesBundle\OpenDxpStaticRoutesBundle::class => ['all' => true], + \OpenDxp\Bundle\TinymceBundle\OpenDxpTinymceBundle::class => ['all' => true], + \OpenDxp\Bundle\UuidBundle\OpenDxpUuidBundle::class => ['all' => true], + \OpenDxp\Bundle\WordExportBundle\OpenDxpWordExportBundle::class => ['all' => true], + \OpenDxp\Bundle\XliffBundle\OpenDxpXliffBundle::class => ['all' => true], + \OpenDxp\Bundle\GenericExecutionEngineBundle\OpenDxpGenericExecutionEngineBundle::class => ['all' => true], ]; diff --git a/config/routes.yaml b/config/routes.yaml index 959da6d..b49b6d8 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -3,4 +3,4 @@ _opendxp: app: resource: '../src/Controller/' - type: attribute \ No newline at end of file + type: attribute diff --git a/src/Kernel.php b/src/Kernel.php index da401bb..edc2ec9 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -21,15 +21,4 @@ class Kernel extends OpenDxpKernel { - /** - * Adds bundles to register to the bundle collection. The collection is able - * to handle priorities and environment specific bundles. - * - */ - public function registerBundlesToCollection(BundleCollection $collection): void - { - if (class_exists(OpenDxpAdminBundle::class)) { - $collection->addBundle(new OpenDxpAdminBundle(), 60); - } - } } From 24fb6b1a3343d0474db9641ba68b815f656c9a52 Mon Sep 17 00:00:00 2001 From: open-dxp-stack <222377954+open-dxp-stack@users.noreply.github.com> Date: Thu, 28 Aug 2025 12:09:29 +0000 Subject: [PATCH 2/3] Apply php-cs-fixer changes --- src/Kernel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Kernel.php b/src/Kernel.php index edc2ec9..36730ae 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -15,8 +15,6 @@ namespace App; -use OpenDxp\Bundle\AdminBundle\OpenDxpAdminBundle; -use OpenDxp\HttpKernel\BundleCollection\BundleCollection; use OpenDxp\Kernel as OpenDxpKernel; class Kernel extends OpenDxpKernel From a8de2487b8fa80b2ca5423ab1d77416804ca68c3 Mon Sep 17 00:00:00 2001 From: open-dxp-stack Date: Thu, 28 Aug 2025 14:20:17 +0200 Subject: [PATCH 3/3] Update bundles.php --- config/bundles.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/bundles.php b/config/bundles.php index 092a9c5..ecb408e 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -1,15 +1,15 @@ ['all' => true], - \OpenDxp\Bundle\CustomReportsBundle\OpenDxpCustomReportsBundle::class => ['all' => true], - \OpenDxp\Bundle\GlossaryBundle\OpenDxpGlossaryBundle::class => ['all' => true], - \OpenDxp\Bundle\SeoBundle\OpenDxpSeoBundle::class => ['all' => true], - \OpenDxp\Bundle\SimpleBackendSearchBundle\OpenDxpSimpleBackendSearchBundle::class => ['all' => true], - \OpenDxp\Bundle\StaticRoutesBundle\OpenDxpStaticRoutesBundle::class => ['all' => true], - \OpenDxp\Bundle\TinymceBundle\OpenDxpTinymceBundle::class => ['all' => true], - \OpenDxp\Bundle\UuidBundle\OpenDxpUuidBundle::class => ['all' => true], - \OpenDxp\Bundle\WordExportBundle\OpenDxpWordExportBundle::class => ['all' => true], - \OpenDxp\Bundle\XliffBundle\OpenDxpXliffBundle::class => ['all' => true], - \OpenDxp\Bundle\GenericExecutionEngineBundle\OpenDxpGenericExecutionEngineBundle::class => ['all' => true], + OpenDxp\Bundle\ApplicationLoggerBundle\OpenDxpApplicationLoggerBundle::class => ['all' => true], + OpenDxp\Bundle\CustomReportsBundle\OpenDxpCustomReportsBundle::class => ['all' => true], + OpenDxp\Bundle\GlossaryBundle\OpenDxpGlossaryBundle::class => ['all' => true], + OpenDxp\Bundle\SeoBundle\OpenDxpSeoBundle::class => ['all' => true], + OpenDxp\Bundle\SimpleBackendSearchBundle\OpenDxpSimpleBackendSearchBundle::class => ['all' => true], + OpenDxp\Bundle\StaticRoutesBundle\OpenDxpStaticRoutesBundle::class => ['all' => true], + OpenDxp\Bundle\TinymceBundle\OpenDxpTinymceBundle::class => ['all' => true], + OpenDxp\Bundle\UuidBundle\OpenDxpUuidBundle::class => ['all' => true], + OpenDxp\Bundle\WordExportBundle\OpenDxpWordExportBundle::class => ['all' => true], + OpenDxp\Bundle\XliffBundle\OpenDxpXliffBundle::class => ['all' => true], + OpenDxp\Bundle\GenericExecutionEngineBundle\OpenDxpGenericExecutionEngineBundle::class => ['all' => true], ];