Merge tag v2.4.0 into develop

roadiz · Dec 6, 2024 · b3ea950 · b3ea950
1 parent 1828252
commit b3ea950
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -27,8 +27,8 @@
         "doctrine/orm": "~2.20.0",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",
-        "roadiz/models": "2.4.x-dev",
-        "roadiz/rozier": "2.4.x-dev",
+        "roadiz/models": "2.4.*",
+        "roadiz/rozier": "2.4.*",
         "symfony/asset": "6.4.*",
         "symfony/cache": "6.4.*",
         "symfony/dotenv": "6.4.*",
@@ -53,11 +53,11 @@
         "phpstan/phpstan": "^1.5.3",
         "phpstan/phpstan-doctrine": "^1.3",
         "phpunit/phpunit": "^9.5",
-        "roadiz/compat-bundle": "2.4.x-dev",
-        "roadiz/core-bundle": "2.4.x-dev",
-        "roadiz/documents": "2.4.x-dev",
-        "roadiz/entity-generator": "2.4.x-dev",
-        "roadiz/rozier-bundle": "2.4.x-dev",
+        "roadiz/compat-bundle": "2.4.*",
+        "roadiz/core-bundle": "2.4.*",
+        "roadiz/documents": "2.4.*",
+        "roadiz/entity-generator": "2.4.*",
+        "roadiz/rozier-bundle": "2.4.*",
         "symfony/browser-kit": "6.4.*",
         "symfony/phpunit-bridge": "^7.0",
         "symfony/stopwatch": "6.4.*"
@@ -87,8 +87,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-main": "2.4.x-dev",
+            "dev-develop": "2.5.x-dev"
         }
     }
 }
diff --git a/src/Controller/Admin/FontsController.php b/src/Controller/Admin/FontsController.php
@@ -22,15 +22,12 @@
 
 class FontsController extends AbstractAdminController
 {
-    private FilesystemOperator $fontStorage;
-
     public function __construct(
-        FilesystemOperator $fontStorage,
+        private readonly FilesystemOperator $fontStorage,
         SerializerInterface $serializer,
         UrlGeneratorInterface $urlGenerator,
     ) {
         parent::__construct($serializer, $urlGenerator);
-        $this->fontStorage = $fontStorage;
     }
 
     protected function supports(PersistableInterface $item): bool

diff --git a/src/EventSubscriber/UpdateFontSubscriber.php b/src/EventSubscriber/UpdateFontSubscriber.php
@@ -12,9 +12,9 @@
 /**
  * Calls font life cycle methods when no data changed according to Doctrine.
  */
-final class UpdateFontSubscriber implements EventSubscriberInterface
+final readonly class UpdateFontSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly FontLifeCycleSubscriber $fontSubscriber)
+    public function __construct(private FontLifeCycleSubscriber $fontSubscriber)
     {
     }
 

diff --git a/src/Form/FontType.php b/src/Form/FontType.php
@@ -12,9 +12,6 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\File;
 
-/**
- * FontType.
- */
 class FontType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void

diff --git a/src/Form/FontVariantsType.php b/src/Form/FontVariantsType.php
@@ -14,9 +14,6 @@
  */
 class FontVariantsType extends AbstractType
 {
-    /**
-     * @param OptionsResolver $resolver [description]
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([