Merge branch 'hotfix/1.8.9'

Author: turegjorup

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.9] - 2025-07-01
+
+- Update to Symfony 7.3, update composer dependencies
+- Fix dependency injection for ExportCrudControllerTrait
+- Split config in dev/prod for secrets to only use vault in production
+
 ## [1.8.8] - 2025-05-12
 
 - Show server actions inline

composer.json

@@ -99,7 +99,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.2.*"
+            "require": "7.3.*"
         }
     },
     "scripts": {

composer.lock

@@ -13,11 +13,19 @@ itkdev_openid_connect:
     azure_az:
       options:
         metadata_url: '%env(string:AZURE_AZ_OIDC_METADATA_URL)%'
-        client_id: '%env(vault:AZURE_AZ_OIDC_CLIENT_ID)%'
-        client_secret: '%env(vault:AZURE_AZ_OIDC_CLIENT_SECRET)%'
+        client_id: '%env(AZURE_AZ_OIDC_CLIENT_ID)%'
+        client_secret: '%env(AZURE_AZ_OIDC_CLIENT_SECRET)%'
         # Specify redirect URI
         redirect_uri: '%env(string:AZURE_AZ_OIDC_REDIRECT_URI)%'
         allow_http: '%env(bool:AZURE_AZ_OIDC_ALLOW_HTTP)%'
         # Optional: Specify leeway (seconds) to account for clock skew between provider and hosting
         #           Defaults to 10
         leeway: '%env(int:AZURE_AZ_OIDC_LEEWAY)%'
+
+when@prod:
+  itkdev_openid_connect:
+    openid_providers:
+      azure_az:
+        options:
+          client_id: '%env(vault:AZURE_AZ_OIDC_CLIENT_ID)%'
+          client_secret: '%env(vault:AZURE_AZ_OIDC_CLIENT_SECRET)%'

config/packages/itkdev_openid_connect.yaml

@@ -209,12 +209,18 @@
                 "deprecated": false,
                 "properties": {
                     "type": {
+                        "default": "",
+                        "example": "",
                         "type": "string"
                     },
                     "rootDir": {
+                        "default": "",
+                        "example": "",
                         "type": "string"
                     },
                     "data": {
+                        "default": "",
+                        "example": "",
                         "type": "string"
                     }
                 }

public/api-spec-v1.json

@@ -145,10 +145,16 @@ components:
       deprecated: false
       properties:
         type:
+          default: ''
+          example: ''
           type: string
         rootDir:
+          default: ''
+          example: ''
           type: string
         data:
+          default: ''
+          example: ''
           type: string
     Error:
       type: object

public/api-spec-v1.yaml

@@ -6,7 +6,6 @@
 
 use App\Entity\OIDC;
 use App\Repository\SiteRepository;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -24,10 +23,8 @@ class OIDCCrudController extends AbstractCrudController
     use ExportCrudControllerTrait;
 
     public function __construct(
-        Exporter $exporter,
         private readonly SiteRepository $siteRepository)
     {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Controller/Admin/OIDCCrudController.php

@@ -9,7 +9,6 @@
 use App\Form\Type\Admin\MariaDbVersionFilter;
 use App\Form\Type\Admin\ServerTypeFilter;
 use App\Form\Type\Admin\SystemFilter;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use App\Types\DatabaseVersionType;
 use App\Types\HostingProviderType;
@@ -34,10 +33,8 @@ class ServerCrudController extends AbstractCrudController
     use ExportCrudControllerTrait;
 
     public function __construct(
-        Exporter $exporter,
         private readonly RequestStack $requestStack,
     ) {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Controller/Admin/ServerCrudController.php

@@ -12,7 +12,6 @@
 use App\Admin\Field\SiteTypeField;
 use App\Admin\Field\VersionField;
 use App\Entity\Site;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -26,9 +25,8 @@ class SiteCrudController extends AbstractCrudController
 {
     use ExportCrudControllerTrait;
 
-    public function __construct(Exporter $exporter)
+    public function __construct()
     {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Controller/Admin/SiteCrudController.php

@@ -13,21 +13,21 @@
 use EasyCorp\Bundle\EasyAdminBundle\Factory\FilterFactory;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Service\Attribute\Required;
 
 trait ExportCrudControllerTrait
 {
     private FilterFactory $filterFactory;
+    private Exporter $exporter;
 
-    /**
-     * @required
-     */
-    public function autowireExportCrudControllerTrait(FilterFactory $filterFactory): void
+    #[Required]
+    public function setFilterFactory(FilterFactory $filterFactory): void
     {
         $this->filterFactory = $filterFactory;
     }
-    private Exporter $exporter;
 
-    protected function setExporter(Exporter $exporter): void
+    #[Required]
+    public function setExporter(Exporter $exporter): void
     {
         $this->exporter = $exporter;
     }