Merge branch '6.x' into chore/composer.json

theus77 · Dec 27, 2023 · 657c576 · 657c576
2 parents b92d6eb + 2c01dbc
commit 657c576
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/EMS/client-helper-bundle/src/Helper/Routing/Route.php b/EMS/client-helper-bundle/src/Helper/Routing/Route.php
@@ -110,14 +110,14 @@ private function resolveOptions(array $options): array
                 'defaults' => [],
                 'requirements' => [],
                 'options' => [],
-                'host' => null,
-                'schemes' => null,
+                'host' => '',
+                'schemes' => [],
                 'prefix' => null,
                 'type' => null,
                 'query' => null,
                 'template' => '[template]',
                 'index_regex' => null,
-                'condition' => null,
+                'condition' => '',
             ])
             ->addAllowedTypes('method', ['string', 'string[]'])
             ->setNormalizer('defaults', function (Options $options, $value) {

diff --git a/EMS/common-bundle/src/Elasticsearch/Response/Response.php b/EMS/common-bundle/src/Elasticsearch/Response/Response.php
@@ -5,6 +5,7 @@
 namespace EMS\CommonBundle\Elasticsearch\Response;
 
 use Elastica\Query;
+use Elastica\Result;
 use Elastica\ResultSet;
 use EMS\CommonBundle\Elasticsearch\Aggregation\Aggregation;
 use EMS\CommonBundle\Elasticsearch\Document\Document;
@@ -152,7 +153,11 @@ public function buildResultSet(Query $query, string $version): ResultSet
             ],
         ], 200);
         $response->getData();
+        $results = [];
+        foreach ($this->hits as $hit) {
+            $results[] = new Result($hit);
+        }
 
-        return new ResultSet($response, $query, []);
+        return new ResultSet($response, $query, $results);
     }
 }
diff --git a/EMS/common-bundle/src/Service/ElasticaService.php b/EMS/common-bundle/src/Service/ElasticaService.php
@@ -164,7 +164,7 @@ public function generateSearch(array $indexes, AbstractQuery $query, array $cont
     public function generateTermsSearch(array $indexes, string $field, array $terms, array $contentTypes = []): Search
     {
         $query = new Terms($field, $terms);
-        if (empty($contentTypes)) {
+        if (!empty($contentTypes)) {
             $query = $this->filterByContentTypes($query, $contentTypes);
         }
 
@@ -405,7 +405,7 @@ public function getDocument(string $index, ?string $contentType, string $id, arr
             $contentTypes[] = $contentType;
         }
 
-        if ($query) {
+        if (null !== $query) {
             $search = $this->generateSearch([$index], $query, $contentTypes);
         } else {
             $search = $this->generateTermsSearch([$index], '_id', [$id], $contentTypes);

diff --git a/EMS/core-bundle/src/Security/Ldap/LdapUserProvider.php b/EMS/core-bundle/src/Security/Ldap/LdapUserProvider.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Ldap\Security\LdapUser;
 use Symfony\Component\Ldap\Security\LdapUserProvider as SymfonyLdapUserProvider;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 class LdapUserProvider extends SymfonyLdapUserProvider
 {
@@ -41,4 +42,13 @@ protected function loadUser(string $identifier, Entry $entry): User
 
         return $user ?: LdapCoreUserFactory::create($ldapUser, $this->ldapConfig);
     }
+
+    public function loadUserByIdentifier(string $identifier): UserInterface
+    {
+        if ('' === $this->ldapConfig->baseDn) {
+            throw new UserNotFoundException(\sprintf('Ldap server not configured'));
+        }
+
+        return parent::loadUserByIdentifier($identifier);
+    }
 }