From e623e9fb467cab93d87c349bf98c2372c7952fdb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 19:30:15 +0100 Subject: [PATCH 1/6] feat(dep): add symfony/runtime --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7632d39..d8e70e1 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,8 @@ "symfony/webpack-encore-bundle": "^1.11", "symfony/yaml": "5.4.*", "twig/extra-bundle": "^2.12|^3.3", - "twig/twig": "^2.12|^3.3" + "twig/twig": "^2.12|^3.3", + "symfony/runtime": "^6.0" }, "autoload": { "psr-4": { From 98c2d703678378cf892a7c27e96454f44afc0271 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 19:32:02 +0100 Subject: [PATCH 2/6] feat(dep): add symfony/flex --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d8e70e1..27b920c 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "symfony/event-dispatcher": "5.4.*", "symfony/expression-language": "5.4.*", "symfony/finder": "5.4.*", - "symfony/flex": "^1.3.1", + "symfony/flex": "^2.2", "symfony/form": "5.4.*", "symfony/framework-bundle": "5.4.*", "symfony/http-client": "5.4.*", From 8ebb54c9a9cd7451bfdaa4cffdd8d2e02aec46a9 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 19:40:00 +0100 Subject: [PATCH 3/6] feat(dep): change version of symfony/runtime --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 27b920c..9786468 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "symfony/yaml": "5.4.*", "twig/extra-bundle": "^2.12|^3.3", "twig/twig": "^2.12|^3.3", - "symfony/runtime": "^6.0" + "symfony/runtime": "^6" }, "autoload": { "psr-4": { From 5626a2522ad294516326b810ee16043cc16ed80f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 19:40:34 +0100 Subject: [PATCH 4/6] feat(dep): remove symfony/runtime --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9786468..c44c093 100644 --- a/composer.json +++ b/composer.json @@ -60,8 +60,7 @@ "symfony/webpack-encore-bundle": "^1.11", "symfony/yaml": "5.4.*", "twig/extra-bundle": "^2.12|^3.3", - "twig/twig": "^2.12|^3.3", - "symfony/runtime": "^6" + "twig/twig": "^2.12|^3.3" }, "autoload": { "psr-4": { From 0a7550940d6fe26c97f43f4774928c7f99d842c2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 19:59:54 +0100 Subject: [PATCH 5/6] feat(dep): add symfony/runtime 5.4 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c44c093..0c4114d 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,8 @@ "symfony/webpack-encore-bundle": "^1.11", "symfony/yaml": "5.4.*", "twig/extra-bundle": "^2.12|^3.3", - "twig/twig": "^2.12|^3.3" + "twig/twig": "^2.12|^3.3", + "symfony/runtime": "^5.4" }, "autoload": { "psr-4": { From e402c49835f9299ee6789b869d74f9151d627789 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 8 Jan 2023 20:50:00 +0100 Subject: [PATCH 6/6] fix(admin): test site_logo before using it --- src/core/Resources/views/admin/module/metas.html.twig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/Resources/views/admin/module/metas.html.twig b/src/core/Resources/views/admin/module/metas.html.twig index bcbdcf3..dfa4845 100644 --- a/src/core/Resources/views/admin/module/metas.html.twig +++ b/src/core/Resources/views/admin/module/metas.html.twig @@ -1,4 +1,6 @@ - - +{% if site_logo is defined %} + + +{% endif %}