From 9a9d212e3bb35c69566d7cbce40a6033830ceba0 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 23 Oct 2025 15:31:48 +0200 Subject: [PATCH 1/2] [Composer] Bumped Ibexa Code Style to v2.1.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 467c345177..1fc3469268 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "require-dev": { "behat/behat": "^3.6.1", "friends-of-behat/mink-extension": "^2.4", - "ibexa/code-style": "~2.0.0", + "ibexa/code-style": "~2.1.0", "ibexa/rector": "~5.0.x-dev", "jenner/simple_fork": "^1.2", "matthiasnoback/symfony-dependency-injection-test": "^5.0", From 052a7ee550b13b4e2d94e9b63ef2ec574d693de8 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 23 Oct 2025 15:33:44 +0200 Subject: [PATCH 2/2] [CS] Aligned codebase with Ibexa Code Style v2.1.0 --- .../Symfony/Templating/Twig/Extension/ContentExtension.php | 4 ++-- .../Templating/Twig/Extension/FieldRenderingExtension.php | 2 +- .../Templating/Twig/Extension/RenderContentExtension.php | 2 +- src/lib/Persistence/Legacy/Content/UrlAlias/SlugConverter.php | 4 ++-- src/lib/Repository/Values/MultiLanguageNameTrait.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php index 29bcbd267b..6ba905ba46 100644 --- a/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php +++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php @@ -260,7 +260,7 @@ private function resolveData(Content|ContentInfo|ContentAwareInterface $data): V return $data; } - return $data->getContent(); + return $data->getContent(); } private function getContent(Content|ContentAwareInterface $data): Content @@ -269,6 +269,6 @@ private function getContent(Content|ContentAwareInterface $data): Content return $data; } - return $data->getContent(); + return $data->getContent(); } } diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php index 4495d6a017..bbf234881d 100644 --- a/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php +++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php @@ -200,6 +200,6 @@ private function getContent(Content|ContentAwareInterface $content): Content return $content; } - return $content->getContent(); + return $content->getContent(); } } diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php index 15ddf03243..543ad0b1e7 100644 --- a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php +++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php @@ -63,6 +63,6 @@ private function getContent(Content|ContentAwareInterface $data): Content return $data; } - return $data->getContent(); + return $data->getContent(); } } diff --git a/src/lib/Persistence/Legacy/Content/UrlAlias/SlugConverter.php b/src/lib/Persistence/Legacy/Content/UrlAlias/SlugConverter.php index 3b46ec8157..afe1d23300 100644 --- a/src/lib/Persistence/Legacy/Content/UrlAlias/SlugConverter.php +++ b/src/lib/Persistence/Legacy/Content/UrlAlias/SlugConverter.php @@ -356,8 +356,8 @@ protected function cleanupText($text, $method) ); break; default: - // Nothing - } + // Nothing + } return $text; } diff --git a/src/lib/Repository/Values/MultiLanguageNameTrait.php b/src/lib/Repository/Values/MultiLanguageNameTrait.php index 2db9b677ad..16c5a4ad54 100644 --- a/src/lib/Repository/Values/MultiLanguageNameTrait.php +++ b/src/lib/Repository/Values/MultiLanguageNameTrait.php @@ -38,7 +38,7 @@ public function getName(?string $languageCode = null): ?string } if (isset($this->mainLanguageCode, $this->names[$this->mainLanguageCode])) { - return $this->names[$this->mainLanguageCode]; + return $this->names[$this->mainLanguageCode]; } return $this->names[array_key_first($this->names)] ?? null;