Merge remote-tracking branch 'origin/master' into sitemapxml_multisit…

…es_languages # Conflicts: # .github/workflows/main-ci.yaml
Novactive · Sep 25, 2024 · 9ab75f9 · 9ab75f9
2 parents 1afa9d1 + a84773e
commit 9ab75f9
Show file tree

Hide file tree

Showing 22 changed files with 162 additions and 19 deletions.
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
@@ -40,7 +40,7 @@ web_environment:
     - PANTHER_CHROME_ARGUMENTS='--disable-dev-shm-usage --ignore-certificate-errors'
     - PANTHER_NO_SANDBOX=1
     - PANTHER_NO_HEADLESS=0
-nodejs_version: "16"
+nodejs_version: "18"
 webimage_extra_packages:
     - pngquant
     - jpegoptim

diff --git a/.github/workflows/main-ci.yaml b/.github/workflows/main-ci.yaml
@@ -43,6 +43,9 @@ jobs:
         strategy:
             matrix:
                 include:
+                    -   ibexa_version: 4.6.7
+                        php: 8.1
+                        node: 18.x
                     -   ibexa_version: 4.5.*
                         php: 8.1
                         node: 14.x

diff --git a/bin/ci-should b/bin/ci-should
@@ -43,7 +43,7 @@ $requiredIbexaVersion = $config['required_ibexa_version'] ?? null;
 if ( $requiredIbexaVersion && $ibexaVersion )
 {
     if(!Semver::satisfies( $ibexaVersion, $requiredIbexaVersion )) {
-        exit( 0 );
+        exit( 1 );
     }
 }
 exit( ( $config[$action] ?? false ) === true ? 0 : 1 );
diff --git a/components/MenuManagerBundle/src/bundle/Resources/translations/ibexa_menu.en.yml b/components/MenuManagerBundle/src/bundle/Resources/translations/ibexa_menu.en.yml
@@ -0,0 +1 @@
+menu_manager: Menu manager
diff --git a/components/MenuManagerBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml b/components/MenuManagerBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml
@@ -0,0 +1 @@
+menu_manager: Gestion des menus
diff --git a/components/SEOBundle/bundle/Core/FieldType/Metas/FormMapper.php b/components/SEOBundle/bundle/Core/FieldType/Metas/FormMapper.php
@@ -89,7 +89,7 @@ public function mapFieldValueForm(FormInterface $fieldForm, FieldData $data)
         $metasData = $data->value->metas;
         foreach ($metasConfig as $key => $meta) {
             $content = isset($metasData[$key]) ? $metasData[$key]->getContent() : null;
-            $fieldType = $meta['type'];
+            $fieldType = $meta['type'] ?? 'text';
             if (isset($metasData[$key]) && '' != $metasData[$key]->getFieldType()) {
                 $fieldType = $metasData[$key]->getFieldType();
             }

diff --git a/components/SEOBundle/bundle/Core/MetaNameSchema.php b/components/SEOBundle/bundle/Core/MetaNameSchema.php
@@ -36,6 +36,7 @@
 use Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper;
 use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\FieldTypeRichText\FieldType\RichText\Value as RichTextValue;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class MetaNameSchema extends NameSchemaService
 {
@@ -82,6 +83,7 @@ class MetaNameSchema extends NameSchemaService
     public function __construct(
         ContentTypeHandler $contentTypeHandler,
         FieldTypeRegistry $fieldTypeRegistry,
+        EventDispatcherInterface $eventDispatcher,
         ContentLanguageHandler $languageHandler,
         RepositoryInterface $repository,
         TranslationHelper $translationHelper,
@@ -93,10 +95,10 @@ public function __construct(
         $handler = new ContentTypeDomainMapper(
             $contentTypeHandler,
             $languageHandler,
-            $this->fieldTypeRegistry
+            $fieldTypeRegistry
         );
 
-        parent::__construct($contentTypeHandler, $handler, $fieldTypeRegistry, $settings);
+        parent::__construct($contentTypeHandler, $handler, $fieldTypeRegistry, $eventDispatcher, $settings);
 
         $this->repository = $repository;
         $this->translationHelper = $translationHelper;
@@ -119,7 +121,7 @@ public function resolveMeta(Meta $meta, Content $content, ContentType $contentTy
     {
         $languages = $this->configurationResolver->getParameter('languages');
 
-        $resolveMultilingue = $this->resolve(
+        $resolveMultilingue = $this->resolveNameSchema(
             $meta->getContent(),
             $content->getContentType(),
             $content->fields,
@@ -335,4 +337,15 @@ protected function handleImageAssetValue(ImageAssetValue $value, $fieldDefinitio
 
         return '';
     }
+
+    /**
+     * Override native function as this prevent usage of `()` inside metas in Ibexa 4.6
+     * {@inheritDoc}
+     */
+    protected function filterNameSchema(string $nameSchema): array
+    {
+        $groupLookupTable = [];
+
+        return [$nameSchema, $groupLookupTable];
+    }
 }
diff --git a/components/SEOBundle/bundle/DependencyInjection/NovaeZSEOExtension.php b/components/SEOBundle/bundle/DependencyInjection/NovaeZSEOExtension.php
@@ -37,6 +37,7 @@ public function prepend(ContainerBuilder $container): void
             'wildcard_routing.yml' => 'ibexa',
             'ez_field_templates.yml' => 'ibexa',
             'variations.yml' => 'ibexa',
+            'ibexa.yaml' => 'ibexa',
             'admin_ui/ez_field_templates.yml' => 'ibexa',
             'ibexa_locale_conversion.yml' => 'ibexa',
         ];

diff --git a/components/SEOBundle/bundle/Form/Type/MetaType.php b/components/SEOBundle/bundle/Form/Type/MetaType.php
@@ -28,7 +28,7 @@
 class MetaType extends AbstractType
 {
     protected SeoMetadataFieldTypeRegistry $metadataFieldTypeRegistry;
-    private ConfigResolverInterface $configResolver;
+    protected ConfigResolverInterface $configResolver;
 
     /**
      * Constructor.
@@ -63,8 +63,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $novaEzseo = $this->configResolver->getParameter('fieldtype_metas', 'nova_ezseo');
         if (isset($novaEzseo[$builder->getName()])) {
             $config = $novaEzseo[$builder->getName()];
-            $type = $config['type'];
-            $options = array_merge($options, $config['params']);
+            $type = $config['type'] ?? $type;
+            if ('select' === $type) {
+                $options = array_merge($options, $config['params']);
+            }
         }
 
         $constraints = $this->getConstraints($config);

diff --git a/components/SEOBundle/bundle/Resources/config/ibexa.yaml b/components/SEOBundle/bundle/Resources/config/ibexa.yaml
@@ -0,0 +1,7 @@
+orm:
+  entity_mappings:
+    NovaeZSEOBundle:
+      is_bundle: true
+      type: annotation
+      dir: Entity
+      prefix: Novactive\Bundle\eZSEOBundle\Entity
diff --git a/components/SEOBundle/ci-config.yaml b/components/SEOBundle/ci-config.yaml
@@ -1,2 +1,3 @@
 install: true
 test: true
+required_ibexa_version: ^4.6
diff --git a/components/SEOBundle/composer.json b/components/SEOBundle/composer.json
@@ -27,10 +27,11 @@
         "MIT"
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-dom": "*",
         "ext-pdo": "*",
-        "ext-json": "*"
+        "ext-json": "*",
+        "ibexa/core": "^4.6"
     },
     "autoload": {
         "psr-4": {

diff --git a/components/SamlBundle/README.md b/components/SamlBundle/README.md
@@ -47,6 +47,32 @@ env(SAML_IDENTITY_PROVIDER_EMAIL_ATTRIBUTE): ~
 env(SAML_IDENTITY_PROVIDER_LOGIN_ATTRIBUTE): ~
 ```
 
+These variables are used to define the following global configuration :
+```
+idp:
+    entityId: '%env(resolve:SAML_IDENTITY_PROVIDER_ENTITYID)%'
+    singleSignOnService:
+        url: '%env(resolve:SAML_IDENTITY_PROVIDER_LOGIN_URL)%'
+        binding: '%env(resolve:SAML_IDENTITY_PROVIDER_LOGIN_BINDING)%'
+    singleLogoutService:
+        url:  '%env(resolve:SAML_IDENTITY_PROVIDER_LOGOUT_URL)%'
+        binding: '%env(resolve:SAML_IDENTITY_PROVIDER_LOGOUT_BINDING)%'
+    x509cert: '%env(resolve:SAML_IDENTITY_PROVIDER_X509_CERT)%'
+sp:
+    entityId: '%env(resolve:SAML_SERVICE_PROVIDER_URL)%/saml/metadata'
+    assertionConsumerService:
+        url: '%env(resolve:SAML_SERVICE_PROVIDER_URL)%/saml/acs'
+        binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
+    singleLogoutService:
+        url: '%env(resolve:SAML_SERVICE_PROVIDER_URL)%/saml/logout'
+        binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+    NameIDFormat: '%env(resolve:SAML_SERVICE_PROVIDER_NAMEID_FORMAT)%'
+baseurl: '%env(resolve:SAML_SERVICE_PROVIDER_URL)%/saml'
+debug: '%kernel.debug%'
+```
+
+To change the configuration based on siteaccess, it's possible to defined it under the folowing siteaccess aware parameter : `almaviacx.saml.<siteaccess|siteaccess_group>.auth_settings`
+
 The following parameters are also available to tweak the behavior
 ```yaml
 # Attribute used to get the email address from
@@ -78,6 +104,4 @@ almaviacx.saml.identity.provider.login.attribute:
 
 # Change the user load method
 almaviacx.saml.config.default.user_load_method: !php/const AlmaviaCX\Bundle\IbexaSaml\Security\Saml\SamlUserProvider::LOAD_METHOD_EMAIL
-
-
 ```
diff --git a/components/SamlBundle/src/bundle/AlmaviaCXIbexaSamlBundle.php b/components/SamlBundle/src/bundle/AlmaviaCXIbexaSamlBundle.php
@@ -4,8 +4,15 @@
 
 namespace AlmaviaCX\Bundle\IbexaSamlBundle;
 
+use AlmaviaCX\Bundle\IbexaSamlBundle\DependencyInjection\Compiler\LazySaml2Auth;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class AlmaviaCXIbexaSamlBundle extends Bundle
 {
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new LazySaml2Auth());
+    }
 }
diff --git a/components/SamlBundle/src/bundle/DependencyInjection/Compiler/LazySaml2Auth.php b/components/SamlBundle/src/bundle/DependencyInjection/Compiler/LazySaml2Auth.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AlmaviaCX\Bundle\IbexaSamlBundle\DependencyInjection\Compiler;
+
+use AlmaviaCX\Bundle\IbexaSaml\Security\Saml\SamlAuthFactory;
+use OneLogin\Saml2\Auth;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class LazySaml2Auth implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition(Auth::class)) {
+            return;
+        }
+
+        $serviceDefinition = $container->getDefinition(Auth::class);
+        $serviceDefinition->setFactory(new Reference(SamlAuthFactory::class));
+        $serviceDefinition->setLazy(true);
+    }
+}
diff --git a/components/SamlBundle/src/bundle/Resources/config/services.yaml b/components/SamlBundle/src/bundle/Resources/config/services.yaml
@@ -1,5 +1,4 @@
 services:
-
     AlmaviaCX\Bundle\IbexaSaml\Security\Saml\SamlExceptionLogger:
         arguments:
             - '@monolog.logger.saml'
@@ -31,7 +30,7 @@ services:
             $userService: '@ibexa.api.service.user'
             $configResolver: '@ibexa.config.resolver'
 
-    # override to make it lazy
-    OneLogin\Saml2\Auth:
-        arguments: [ '%hslavich_onelogin_saml.settings%' ]
-        lazy: true
+    AlmaviaCX\Bundle\IbexaSaml\Security\Saml\SamlAuthFactory:
+        arguments:
+            $configResolver: '@Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface'
+            $defaultSettings: '%hslavich_onelogin_saml.settings%'
diff --git a/components/SamlBundle/src/lib/Security/Saml/SamlAuthFactory.php b/components/SamlBundle/src/lib/Security/Saml/SamlAuthFactory.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AlmaviaCX\Bundle\IbexaSaml\Security\Saml;
+
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
+use Ibexa\Core\MVC\Exception\ParameterNotFoundException;
+use OneLogin\Saml2\Auth;
+
+class SamlAuthFactory
+{
+    protected ConfigResolverInterface $configResolver;
+    protected array $defaultSettings;
+
+    public function __construct(
+        ConfigResolverInterface $configResolver,
+        array $defaultSettings
+    ) {
+        $this->defaultSettings = $defaultSettings;
+        $this->configResolver = $configResolver;
+    }
+
+    public function __invoke(): Auth
+    {
+        $settings = $this->defaultSettings;
+        try {
+            $saSettings = $this->configResolver->getParameter('auth_settings', 'almaviacx.saml');
+        } catch (ParameterNotFoundException $exception) {
+            $saSettings = [];
+        }
+
+        return new Auth($this->mergeSettings($settings, $saSettings));
+    }
+
+    protected function mergeSettings(array $defaultSettings, array $settings): array
+    {
+        foreach ($defaultSettings as $key => $setting) {
+            if (!isset($settings[$key])) {
+                continue;
+            }
+            if (is_array($setting)) {
+                $defaultSettings[$key] = $this->mergeSettings($defaultSettings[$key], $settings[$key]);
+            } else {
+                $defaultSettings[$key] = $settings[$key];
+            }
+        }
+
+        return $defaultSettings;
+    }
+}
diff --git a/components/SolrSearchExtraBundle/src/bundle/Resources/translations/ibexa_menu.en.yml b/components/SolrSearchExtraBundle/src/bundle/Resources/translations/ibexa_menu.en.yml
@@ -0,0 +1,2 @@
+solr_admin: Solr
+solr_admin.resources: Manage Synonyms/Stopwords
diff --git a/components/SolrSearchExtraBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml b/components/SolrSearchExtraBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml
@@ -0,0 +1,2 @@
+solr_admin: Solr
+solr_admin.resources: Gestion des synonymes/mots vides
diff --git a/components/SolrSearchExtraBundle/src/lib/Query/Content/CriterionVisitor/FilterTag.php b/components/SolrSearchExtraBundle/src/lib/Query/Content/CriterionVisitor/FilterTag.php
@@ -26,7 +26,8 @@ public function canVisit(Criterion $criterion): bool
      */
     public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null): string
     {
-        $stringQuery = strtr($subVisitor->visit($criterion->criterion), ['(' => '', ')' => '']);
+        $stringQuery = $subVisitor->visit($criterion->criterion);
+        $stringQuery = trim($stringQuery, '()');
 
         return '{!tag='.$criterion->tag.'}('.$stringQuery.')';
     }

diff --git a/components/TranslationUiBundle/src/bundle/Resources/translations/ibexa_menu.en.yml b/components/TranslationUiBundle/src/bundle/Resources/translations/ibexa_menu.en.yml
@@ -0,0 +1 @@
+ibexa.translation.ui.label: Translations UI
diff --git a/components/TranslationUiBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml b/components/TranslationUiBundle/src/bundle/Resources/translations/ibexa_menu.fr.yml
@@ -0,0 +1 @@
+ibexa.translation.ui.label: Gestion des traductions