Merge branch '6.x' into ref/ts

EMS/client-helper-bundle/src/Command/HealthCheckCommand.php

@@ -27,7 +27,7 @@ final class HealthCheckCommand extends AbstractCommand
     public function __construct(
         private readonly EnvironmentHelper $environmentHelper,
         private readonly ElasticaService $elasticaService,
-        private readonly ?StorageManager $storageManager = null
+        private readonly ?StorageManager $storageManager = null,
     ) {
         parent::__construct();
     }

EMS/client-helper-bundle/src/Command/Local/UploadAssetsCommand.php

@@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $hash = match ($this->archiveType) {
                 self::ARCHIVE_ZIP => $this->uploadZipArchive(),
                 self::ARCHIVE_EMS => $this->uploadEmsArchive(),
-                default => false
+                default => false,
             };
 
             if (!$hash) {

EMS/client-helper-bundle/src/Controller/ApiController.php

@@ -17,7 +17,7 @@ final class ApiController
 {
     public function __construct(
         private readonly ApiService $service,
-        private readonly HashcashHelper $hashcashHelper
+        private readonly HashcashHelper $hashcashHelper,
     ) {
     }
 

EMS/client-helper-bundle/src/Controller/Security/LoginController.php

@@ -21,7 +21,7 @@ class LoginController
     public function __construct(
         private readonly Handler $handler,
         private readonly Environment $templating,
-        private readonly FormFactory $formFactory
+        private readonly FormFactory $formFactory,
     ) {
     }
 

EMS/client-helper-bundle/src/Controller/Security/Sso/OAuth2Controller.php

@@ -13,7 +13,7 @@
 class OAuth2Controller
 {
     public function __construct(
-        private readonly OAuth2Service $oAuth2Service
+        private readonly OAuth2Service $oAuth2Service,
     ) {
     }
 

EMS/client-helper-bundle/src/Controller/Security/Sso/SamlController.php

@@ -12,7 +12,7 @@
 class SamlController
 {
     public function __construct(
-        private readonly SamlService $samlService
+        private readonly SamlService $samlService,
     ) {
     }
 

EMS/client-helper-bundle/src/DependencyInjection/Configuration.php

@@ -185,15 +185,15 @@ private function addSecuritySection(ArrayNodeDefinition $rootNode): void
                 OAuth2Property::SCOPES => $oAuth2
                     ->variableNode($oAuth2Property->value)
                     ->defaultValue(AzureOAuth2Provider::DEFAULT_SCOPES),
-                default => $oAuth2->scalarNode($oAuth2Property->value)
+                default => $oAuth2->scalarNode($oAuth2Property->value),
             };
         }
 
         $saml = $sso->arrayNode('saml')->canBeEnabled()->children();
         foreach (SamlProperty::cases() as $samlProperty) {
             match ($samlProperty) {
                 SamlProperty::SECURITY => $saml->variableNode($samlProperty->value)->end(),
-                default => $saml->scalarNode($samlProperty->value)->end()
+                default => $saml->scalarNode($samlProperty->value)->end(),
             };
         }
     }

EMS/client-helper-bundle/src/EventListener/AuthenticatedListener.php

@@ -18,7 +18,7 @@ class AuthenticatedListener implements EventSubscriberInterface
     public function __construct(
         private readonly AuthorizationCheckerInterface $authorizationChecker,
         private readonly TokenStorageInterface $tokenStorage,
-        private readonly OAuth2Service $oAuth2Service
+        private readonly OAuth2Service $oAuth2Service,
     ) {
     }
 

EMS/client-helper-bundle/src/Helper/Api/ApiService.php

@@ -32,7 +32,7 @@ public function __construct(
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly Security $security,
         private readonly iterable $clientRequests = [],
-        private readonly iterable $apiClients = []
+        private readonly iterable $apiClients = [],
     ) {
     }
 

EMS/client-helper-bundle/src/Helper/Elasticsearch/Settings.php

@@ -70,6 +70,15 @@ public function getTemplateContentType(string $contentTypeName): ContentType
         return $this->templateContentTypes[$contentTypeName];
     }
 
+    public function hasTemplateContentType(string $contentTypeName): bool
+    {
+        if (empty($this->templateContentTypes)) {
+            throw new \RuntimeException('Missing config EMSCH_TEMPLATES');
+        }
+
+        return isset($this->templateContentTypes[$contentTypeName]);
+    }
+
     /**
      * @return ContentType[]
      */

EMS/client-helper-bundle/src/Helper/Environment/EnvironmentHelper.php

@@ -20,7 +20,7 @@ public function __construct(
         private readonly EnvironmentFactory $environmentFactory,
         private readonly RequestStack $requestStack,
         private readonly string $emschEnv,
-        array $environments
+        array $environments,
     ) {
         foreach ($environments as $name => $config) {
             $this->addEnvironment($name, $config);

EMS/client-helper-bundle/src/Helper/Local/LocalEnvironment.php

@@ -21,7 +21,7 @@ final class LocalEnvironment
 
     public function __construct(
         private readonly Environment $environment,
-        private readonly string $directory
+        private readonly string $directory,
     ) {
         $this->fileSystem = new Filesystem();
     }

EMS/client-helper-bundle/src/Helper/Local/LocalEnvironmentFactory.php

@@ -10,7 +10,7 @@ final class LocalEnvironmentFactory
 {
     public function __construct(
         private readonly string $projectDir,
-        private readonly ?string $localPath = null
+        private readonly ?string $localPath = null,
     ) {
     }
 

EMS/client-helper-bundle/src/Helper/Local/LocalHelper.php

@@ -30,7 +30,7 @@ public function __construct(
         private readonly Builders $builders,
         private readonly EnvironmentApi $environmentApi,
         private LoggerInterface $logger,
-        private readonly string $projectDir
+        private readonly string $projectDir,
     ) {
         $this->clientRequest = $clientRequestManager->getDefault();
     }

EMS/client-helper-bundle/src/Helper/Request/Handler.php

@@ -26,7 +26,7 @@ final class Handler implements HandlerInterface
     public function __construct(
         ClientRequestManager $manager,
         private readonly RouterInterface $router,
-        private readonly ?Profiler $profiler
+        private readonly ?Profiler $profiler,
     ) {
         $this->clientRequest = $manager->getDefault();
     }

EMS/client-helper-bundle/src/Helper/Routing/Router.php

@@ -11,7 +11,7 @@ final class Router extends BaseRouter
 {
     public function __construct(
         private readonly EnvironmentHelper $environmentHelper,
-        private readonly RoutingBuilder $builder
+        private readonly RoutingBuilder $builder,
     ) {
     }
 

EMS/client-helper-bundle/src/Helper/Search/QueryBuilder.php

@@ -22,7 +22,7 @@ final class QueryBuilder
 {
     public function __construct(
         private readonly ClientRequest $clientRequest,
-        private readonly Search $search
+        private readonly Search $search,
     ) {
     }
 

EMS/client-helper-bundle/src/Helper/Search/Search.php

@@ -158,9 +158,6 @@ public function getFields(): array
         return $this->fields;
     }
 
-    /**
-     * @return ?BoolQuery
-     */
     public function getQuerySearch(string $queryString): ?BoolQuery
     {
         if (null === $this->querySearch) {

EMS/client-helper-bundle/src/Helper/Templating/TemplateBuilder.php

@@ -4,6 +4,7 @@
 
 namespace EMS\ClientHelperBundle\Helper\Templating;
 
+use EMS\ClientHelperBundle\Exception\SingleResultException;
 use EMS\ClientHelperBundle\Helper\Builder\AbstractBuilder;
 use EMS\ClientHelperBundle\Helper\Environment\Environment;
 
@@ -71,4 +72,23 @@ public function isFresh(Environment $environment, TemplateName $templateName, in
 
         return $contentType->isLastPublishedAfterTime($time);
     }
+
+    public function exists(Environment $environment, TemplateName $templateName): bool
+    {
+        $settings = $this->settings($environment);
+        if ($environment->isLocalPulled()) {
+            return null !== $environment->getLocal()->getTemplates($settings)->find($templateName);
+        }
+        if (!$settings->hasTemplateContentType($templateName->getContentType())) {
+            return false;
+        }
+
+        try {
+            $this->buildTemplate($environment, $templateName);
+        } catch (SingleResultException) {
+            return false;
+        }
+
+        return true;
+    }
 }

EMS/client-helper-bundle/src/Helper/Templating/TemplateLoader.php

@@ -69,8 +69,13 @@ public function exists($name): bool
         if (null === $this->environmentHelper->getCurrentEnvironment()) {
             return false;
         }
+        if (!TemplateName::validate($name)) {
+            return false;
+        }
+        $environment = $this->getEnvironment();
+        $templateName = new TemplateName($name);
 
-        return TemplateName::validate($name);
+        return $this->builder->exists($environment, $templateName);
     }
 
     private function getEnvironment(): Environment

EMS/client-helper-bundle/src/Helper/Translation/TranslationDocument.php

@@ -42,15 +42,7 @@ public function getName(): string
      */
     public function getDataSource(): array
     {
-        $source = ['key' => $this->source['key']];
-
-        foreach ($this->locales as $locale) {
-            if (isset($this->source['label_'.$locale])) {
-                $source['label_'.$locale] = $this->source['label_'.$locale];
-            }
-        }
-
-        return $source;
+        return \array_filter($this->source, fn ($key) => 'key' === $key || \str_starts_with($key, 'label_'), ARRAY_FILTER_USE_KEY);
     }
 
     /**

EMS/client-helper-bundle/src/Helper/Translation/TranslationFiles.php

@@ -22,10 +22,11 @@ public function __construct(string $directory)
     {
         $path = $directory.\DIRECTORY_SEPARATOR.self::DIRECTORY;
 
-        if (\file_exists($path)) {
-            foreach (Finder::create()->in($path)->files()->name('*.yaml') as $file) {
-                $this->files[] = new TranslationFile($file);
-            }
+        if (!\file_exists($path)) {
+            return;
+        }
+        foreach (Finder::create()->in($path)->files()->name('*.yaml') as $file) {
+            $this->files[] = new TranslationFile($file);
         }
     }
 

EMS/client-helper-bundle/src/Security/CoreApi/CoreApiFactory.php

@@ -12,7 +12,7 @@ class CoreApiFactory
 {
     public function __construct(
         private readonly ClientRequestManager $clientRequestManager,
-        private readonly EnvironmentApi $environmentApi
+        private readonly EnvironmentApi $environmentApi,
     ) {
     }
 

EMS/client-helper-bundle/src/Security/CoreApi/User/CoreApiUser.php

@@ -17,7 +17,7 @@ class CoreApiUser implements UserInterface
 
     public function __construct(
         public readonly ProfileInterface $profile,
-        private readonly string $token
+        private readonly string $token,
     ) {
         $this->displayName = $this->profile->getDisplayName();
         $this->username = $this->profile->getUsername();

EMS/client-helper-bundle/src/Security/CoreApi/User/CoreApiUserProvider.php

@@ -18,7 +18,7 @@ class CoreApiUserProvider implements UserProviderInterface
 {
     public function __construct(
         private readonly CoreApiFactory $coreApiFactory,
-        private readonly LoggerInterface $logger
+        private readonly LoggerInterface $logger,
     ) {
     }
 

EMS/client-helper-bundle/src/Security/FirewallEntryPoint.php

@@ -19,7 +19,7 @@ public function __construct(
         private readonly HttpUtils $httpUtils,
         private readonly RouterInterface $router,
         private readonly SsoService $ssoService,
-        private readonly string $routeLoginName
+        private readonly string $routeLoginName,
     ) {
     }
 
@@ -30,7 +30,7 @@ public function start(Request $request, ?AuthenticationException $authException
         return match (true) {
             null !== $routeLogin => $this->httpUtils->createRedirectResponse($request, $this->routeLoginName),
             $this->ssoService->enabled() => $this->ssoService->start($request),
-            default => throw new NotAnEntryPointException()
+            default => throw new NotAnEntryPointException(),
         };
     }
 }

EMS/client-helper-bundle/src/Security/Sso/OAuth2/OAuth2Service.php

@@ -103,7 +103,7 @@ private function createProvider(): ProviderInterface
                 encryptionAlgorithm: $this->optionalProperty(OAuth2Property::ENCRYPTION_ALGORITHM),
                 encryptionKey: $this->optionalProperty(OAuth2Property::ENCRYPTION_KEY)
             ),
-            default => throw new \RuntimeException('invalid provider type')
+            default => throw new \RuntimeException('invalid provider type'),
         };
     }
 

EMS/client-helper-bundle/src/Security/Sso/OAuth2/OAuth2Token.php

@@ -17,7 +17,7 @@ public function __construct(
         private readonly AccessTokenInterface $accessToken,
         UserInterface $user,
         string $firewallName,
-        array $roles
+        array $roles,
     ) {
         parent::__construct($user, $firewallName, $roles);
     }

EMS/client-helper-bundle/src/Security/Sso/OAuth2/Provider/AzureOAuth2Provider.php

@@ -32,7 +32,7 @@ public function __construct(
         string $clientSecret,
         string $redirectUri,
         ?array $scopes,
-        ?string $version
+        ?string $version,
     ) {
         $scopes = $scopes ?? self::DEFAULT_SCOPES;
         $serviceScopes = \array_filter($scopes, static fn (string $s) => u($s)->startsWith('http'));

EMS/client-helper-bundle/src/Security/Sso/Saml/SamlService.php

@@ -49,7 +49,7 @@ class SamlService
     public function __construct(
         private readonly RequestStack $requestStack,
         private readonly HttpUtils $httpUtils,
-        private readonly array $config
+        private readonly array $config,
     ) {
     }
 

EMS/client-helper-bundle/src/Security/Sso/SsoService.php

@@ -28,7 +28,7 @@ public function start(Request $request): RedirectResponse
         return match (true) {
             $this->oAuth2Service->isEnabled() => $this->oAuth2Service->login($request),
             $this->samlService->isEnabled() => $this->samlService->login($request),
-            default => throw new \RuntimeException('Could not start sso, nothing enabled')
+            default => throw new \RuntimeException('Could not start sso, nothing enabled'),
         };
     }
 

EMS/common-bundle/src/Command/BatchCommand.php

@@ -79,7 +79,7 @@ private function getTemplate(string $name): TemplateWrapper
         $source = match (true) {
             u($name)->startsWith('@EMSCH') => $this->twig->getLoader()->getSourceContext($name)->getCode(),
             \file_exists($name) => File::fromFilename($name)->getContents(),
-            default => $name
+            default => $name,
         };
 
         return $this->twig->createTemplate($source);

EMS/common-bundle/src/Command/FileStructure/FileStructurePublishCommand.php

@@ -35,7 +35,7 @@ class FileStructurePublishCommand extends AbstractCommand
 
     public function __construct(
         private readonly AdminHelper $adminHelper,
-        private readonly StorageManager $storageManager
+        private readonly StorageManager $storageManager,
     ) {
         parent::__construct();
     }

EMS/common-bundle/src/Common/CoreApi/Result.php

@@ -17,7 +17,7 @@ class Result
 
     public function __construct(
         public readonly ResponseInterface $response,
-        LoggerInterface $logger
+        LoggerInterface $logger,
     ) {
         $data = Json::decode($response->getContent());
         $this->data = $data;
@@ -39,7 +39,7 @@ public function getFirstErrorWarning(): ?string
         return match (true) {
             (\count($errors) > 0) => \array_shift($errors),
             (\count($warnings) > 0) => \array_shift($warnings),
-            default => null
+            default => null,
         };
     }
 

EMS/common-bundle/src/Common/Log/LocalizedLogger.php

@@ -17,7 +17,7 @@ class LocalizedLogger extends AbstractLogger implements LocalizedLoggerInterface
     public function __construct(
         private readonly LoggerInterface $logger,
         private readonly TranslatorInterface $translator,
-        private readonly string $translationDomain
+        private readonly string $translationDomain,
     ) {
     }