From a47201e71ecf6b84bf6344c5844ed73b86c1e3b6 Mon Sep 17 00:00:00 2001 From: Dominik Kasprzak Date: Fri, 24 Sep 2021 17:13:07 +0200 Subject: [PATCH 1/3] Integrate extra fields and indices into the bundle configuration --- src/DependencyInjection/Configuration.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 7896f572..008d448a 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -91,6 +91,16 @@ private function getProvidersNode(): ArrayNodeDefinition } } + // "extra_fields" is an empty array by default. + if (!\array_key_exists('extra_fields', $v['doctrine']) || !\is_array($v['doctrine']['extra_fields'])) { + $v['doctrine']['extra_fields'] = []; + } + + // "extra_indices" is an empty array by default. + if (!\array_key_exists('extra_indices', $v['doctrine']) || !\is_array($v['doctrine']['extra_indices'])) { + $v['doctrine']['extra_indices'] = []; + } + // "doctrine.orm.default_entity_manager" is the default "storage_services" if (\array_key_exists('storage_services', $v['doctrine']) && \is_string($v['doctrine']['storage_services'])) { $v['doctrine']['storage_services'] = [$v['doctrine']['storage_services']]; From d36c2929d01c13b1091aec93b38e3f3bc200a539 Mon Sep 17 00:00:00 2001 From: Dominik Kasprzak Date: Tue, 22 Nov 2022 12:26:03 +0100 Subject: [PATCH 2/3] Symfony 6 --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 composer.json diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index 40cbc509..83770ff1 --- a/composer.json +++ b/composer.json @@ -19,11 +19,11 @@ "doctrine/orm": "^2.7", "symfony/asset": "^4.0|^5.0", "symfony/doctrine-bridge": "^4.4.19|^5.2.2", - "symfony/event-dispatcher": "^4.0|^5.0", - "symfony/lock": "^4.0|^5.0", - "symfony/security-bundle": "^4.0|^5.0", - "symfony/translation": "^4.0|^5.0", - "symfony/twig-bundle": "^4.0|^5.0", + "symfony/event-dispatcher": "^4.0|^5.0|^6.0", + "symfony/lock": "^4.0|^5.0|^6.0", + "symfony/security-bundle": "^4.0|^5.0|^6.0", + "symfony/translation": "^4.0|^5.0|^6.0", + "symfony/twig-bundle": "^4.0|^5.0|^6.0", "twig/extra-bundle": "^3.3", "twig/intl-extra": "^3.3" }, @@ -49,10 +49,10 @@ "phpstan/phpstan-strict-rules": "^0.12", "phpstan/phpstan-symfony": "^0.12", "phpunit/phpunit": "^8.0|^9.0", - "symfony/browser-kit": "^4.0|^5.1", - "symfony/css-selector": "^5.1", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/var-dumper": "^4.0|^5.0", + "symfony/browser-kit": "^4.0|^5.1|^6.0", + "symfony/css-selector": "^5.1|^6.0", + "symfony/framework-bundle": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.0|^5.0|^6.0", "symfony/webpack-encore-bundle": "^1.12", "twig/extensions": "^1.5" }, From 0b33ba1e1e51885fa061501fec1bdf77d2e3e822 Mon Sep 17 00:00:00 2001 From: WhatsOn Date: Thu, 1 Dec 2022 10:18:30 +0100 Subject: [PATCH 3/3] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 83770ff1..55ed5cd1 100755 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "doctrine/annotations": "^1.8", "doctrine/doctrine-bundle": "^1.9|^2.0", "doctrine/orm": "^2.7", - "symfony/asset": "^4.0|^5.0", - "symfony/doctrine-bridge": "^4.4.19|^5.2.2", + "symfony/asset": "^4.0|^5.0|^6.0", + "symfony/doctrine-bridge": "^4.4.19|^5.2.2|^6.0", "symfony/event-dispatcher": "^4.0|^5.0|^6.0", "symfony/lock": "^4.0|^5.0|^6.0", "symfony/security-bundle": "^4.0|^5.0|^6.0",