Merge branch hotfix/v2.3.28

roadiz · Sep 24, 2024 · f8ce66b · f8ce66b
1 parent d6e16d6
commit f8ce66b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 51 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2023 Ambroise Maupate
+Copyright © 2024 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/composer.json b/composer.json
@@ -17,32 +17,33 @@
         }
     ],
     "type": "symfony-bundle",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.1",
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "~2.17.0",
+        "doctrine/orm": "~2.19.0",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",
-        "roadiz/models": "2.2.*",
-        "roadiz/rozier": "2.2.*",
+        "roadiz/models": "2.3.*",
+        "roadiz/rozier": "2.3.*",
         "sensio/framework-extra-bundle": "^6.1",
-        "symfony/asset": "5.4.*",
-        "symfony/cache": "5.4.*",
-        "symfony/dotenv": "5.4.*",
-        "symfony/expression-language": "5.4.*",
-        "symfony/form": "5.4.*",
-        "symfony/framework-bundle": "5.4.*",
-        "symfony/http-client": "5.4.*",
-        "symfony/intl": "5.4.*",
-        "symfony/runtime": "5.4.*",
-        "symfony/string": "5.4.*",
-        "symfony/translation": "5.4.*",
-        "symfony/twig-bundle": "5.4.*",
-        "symfony/validator": "5.4.*",
-        "symfony/yaml": "5.4.*",
+        "symfony/asset": "6.4.*",
+        "symfony/cache": "6.4.*",
+        "symfony/dotenv": "6.4.*",
+        "symfony/expression-language": "6.4.*",
+        "symfony/form": "6.4.*",
+        "symfony/framework-bundle": "6.4.*",
+        "symfony/http-client": "6.4.*",
+        "symfony/intl": "6.4.*",
+        "symfony/runtime": "6.4.*",
+        "symfony/string": "6.4.*",
+        "symfony/translation": "6.4.*",
+        "symfony/twig-bundle": "6.4.*",
+        "symfony/validator": "6.4.*",
+        "symfony/yaml": "6.4.*",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "*",
         "twig/string-extra": "*",
@@ -54,14 +55,14 @@
         "phpstan/phpstan-doctrine": "^1.3",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/browser-kit": "5.4.*",
-        "symfony/phpunit-bridge": "5.4.*",
-        "symfony/stopwatch": "5.4.*",
-        "roadiz/core-bundle": "2.2.*",
-        "roadiz/compat-bundle": "2.2.*",
-        "roadiz/rozier-bundle": "2.2.*",
-        "roadiz/documents": "2.2.*",
-        "roadiz/entity-generator": "2.2.*"
+        "symfony/browser-kit": "6.4.*",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/stopwatch": "6.4.*",
+        "roadiz/core-bundle": "2.3.*",
+        "roadiz/compat-bundle": "2.3.*",
+        "roadiz/rozier-bundle": "2.3.*",
+        "roadiz/documents": "2.3.*",
+        "roadiz/entity-generator": "2.3.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -88,8 +89,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.x-dev",
-            "dev-develop": "2.3.x-dev"
+            "dev-main": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,12 +1,14 @@
 parameters:
-    level: 5
+    level: 7
     paths:
         - src
     excludePaths:
         - */node_modules/*
         - */bower_components/*
         - */static/*
     ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
         - '#Call to an undefined method RZ\\Roadiz\\CoreBundle\\Repository#'
         - '#Call to an undefined method RZ\\Roadiz\\UserBundle\\Repository#'
         - '#Call to an undefined method Doctrine\\Persistence\\ObjectRepository#'
@@ -30,7 +32,5 @@ parameters:
         - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
 
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
 includes:
     - vendor/phpstan/phpstan-doctrine/extension.neon
diff --git a/src/Controller/FontFaceController.php b/src/Controller/FontFaceController.php
@@ -15,18 +15,11 @@
 
 final class FontFaceController
 {
-    private ManagerRegistry $managerRegistry;
-    private Environment $templating;
-    private FilesystemOperator $fontStorage;
-
     public function __construct(
-        FilesystemOperator $fontStorage,
-        ManagerRegistry $managerRegistry,
-        Environment $templating,
+        private readonly FilesystemOperator $fontStorage,
+        private readonly ManagerRegistry $managerRegistry,
+        private readonly Environment $templating,
     ) {
-        $this->managerRegistry = $managerRegistry;
-        $this->templating = $templating;
-        $this->fontStorage = $fontStorage;
     }
 
     private function getFontData(Font $font, string $extension): ?array

diff --git a/src/Doctrine/EventSubscriber/FontLifeCycleSubscriber.php b/src/Doctrine/EventSubscriber/FontLifeCycleSubscriber.php
@@ -19,13 +19,11 @@
 final class FontLifeCycleSubscriber implements EventSubscriber
 {
     private static array $formats = ['svg', 'otf', 'eot', 'woff', 'woff2'];
-    private LoggerInterface $logger;
-    private FilesystemOperator $fontStorage;
 
-    public function __construct(FilesystemOperator $fontStorage, LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-        $this->fontStorage = $fontStorage;
+    public function __construct(
+        private readonly FilesystemOperator $fontStorage,
+        private readonly LoggerInterface $logger
+    ) {
     }
 
     /**

diff --git a/src/EventSubscriber/UpdateFontSubscriber.php b/src/EventSubscriber/UpdateFontSubscriber.php
@@ -16,11 +16,8 @@
  */
 final class UpdateFontSubscriber implements EventSubscriberInterface
 {
-    private FontLifeCycleSubscriber $fontSubscriber;
-
-    public function __construct(FontLifeCycleSubscriber $fontSubscriber)
+    public function __construct(private readonly FontLifeCycleSubscriber $fontSubscriber)
     {
-        $this->fontSubscriber = $fontSubscriber;
     }
 
     /**