Merge branch '1.x' of https://github.com/open-dxp/advanced-object-search-bundle into 1.x

Author: open-dxp-stack

.php-cs-fixer.cache

@@ -0,0 +1 @@
+{"php":"8.4.15","version":"3.90.0","indent":"    ","lineEnding":"\n","rules":{"encoding":true,"full_opening_tag":true,"blank_line_after_namespace":true,"braces_position":true,"class_definition":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":{"closure_fn_spacing":"one"},"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ignore"},"modifier_keywords":{"elements":["method","property"]},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"single_space_around_construct":{"constructs_followed_by_a_single_space":["abstract","as","case","catch","class","do","else","elseif","final","for","foreach","function","if","interface","namespace","private","protected","public","static","switch","trait","try","use_lambda","while"],"constructs_preceded_by_a_single_space":["as","else","elseif","use_lambda"]},"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"array_syntax":{"syntax":"short"},"list_syntax":{"syntax":"short"},"header_comment":{"comment_type":"PHPDoc","header":"OpenDXP\n\nThis source file is licensed under the GNU General Public License version 3 (GPLv3).\n\nFull copyright and license information is available in\nLICENSE.md which is distributed with this source code.\n\n@copyright  Copyright (c) Pimcore GmbH (https:\/\/pimcore.com)\n@copyright  Modification Copyright (c) OpenDXP (https:\/\/www.opendxp.ch)\n@license    https:\/\/www.gnu.org\/licenses\/gpl-3.0.html  GNU General Public License version 3 (GPLv3)"},"blank_line_before_statement":true,"function_typehint_space":true,"single_line_comment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"class_attributes_separation":true,"native_function_casing":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_short_bool_cast":true,"no_spaces_around_offset":true,"no_superfluous_phpdoc_tags":{"allow_mixed":true,"remove_inheritdoc":true},"no_unneeded_control_parentheses":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"object_operator_without_whitespace":true,"ordered_imports":true,"phpdoc_indent":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"whitespace_after_comma_in_array":true},"hashes":{"src\/Filter\/FilterEntry.php":"fdf3112e2215c83337ced7b920079d36","src\/Filter\/FieldSelectionInformation.php":"91b2069735d64e81f1736145a07d3560","src\/Filter\/FieldDefinitionAdapter\/Select.php":"18028dfb9c5d8227e862117e4a2db037","src\/Filter\/FieldDefinitionAdapter\/Fieldcollections.php":"df0437d27697b8d9d24c90df36c353e1","src\/Filter\/FieldDefinitionAdapter\/AdvancedManyToManyObjectRelation.php":"1cc96e013e6a61f404b2fbb99810665f","src\/Filter\/FieldDefinitionAdapter\/CalculatedValue.php":"f2daf6fabcb5757b64d7a532fe733bee","src\/Filter\/FieldDefinitionAdapter\/Datetime.php":"e1bf776d29d9165e4181c6c1be332e44","src\/Filter\/FieldDefinitionAdapter\/ManyToManyRelation.php":"46a027bbfee6e3f647931753b275ebc5","src\/Filter\/FieldDefinitionAdapter\/FieldDefinitionAdapterInterface.php":"99cf5b6c8999582d0e76651fd408c889","src\/Filter\/FieldDefinitionAdapter\/Checkbox.php":"72e3a9cd26371e371725831841358894","src\/Filter\/FieldDefinitionAdapter\/Multiselect.php":"9582bf53c88c0aec304d03a143049fbe","src\/Filter\/FieldDefinitionAdapter\/DefaultAdapter.php":"5268e963e103612e0212ea8750de53cf","src\/Filter\/FieldDefinitionAdapter\/Time.php":"4abc387682cb9b3dbd6e10610b518e8b","src\/Filter\/FieldDefinitionAdapter\/Objectbricks.php":"eb51d5df515d5305e0a128531e2c0d34","src\/Filter\/FieldDefinitionAdapter\/Languagemultiselect.php":"b69e792647e3f5e14b754cf4fdb86ceb","src\/Filter\/FieldDefinitionAdapter\/QuantityValue.php":"14f7a65858eec0092ca40fdf42f8259a","src\/Filter\/FieldDefinitionAdapter\/Countrymultiselect.php":"4b79222d4adfd150c66226d1da516f41","src\/Filter\/FieldDefinitionAdapter\/Language.php":"7b06878aee803f17d8a1aa7d5138d32d","src\/Filter\/FieldDefinitionAdapter\/User.php":"6b325fcbef4fd94caba27c17e8662575","src\/Filter\/FieldDefinitionAdapter\/ManyToManyObjectRelation.php":"73428195775d6c01693bd9862037fa85","src\/Filter\/FieldDefinitionAdapter\/Country.php":"1398d6dfd874d425e2177bccbaaf7f92","src\/Filter\/FieldDefinitionAdapter\/Date.php":"45d3c910b0a861b279a6360f15686d1f","src\/Filter\/FieldDefinitionAdapter\/AdvancedManyToManyRelation.php":"a5551f8193f4762e9dafc6e364d4e176","src\/Filter\/FieldDefinitionAdapter\/Table.php":"3937409a53dc55123405cc0f9d90d826","src\/Filter\/FieldDefinitionAdapter\/Localizedfields.php":"188295d4db60dbd85197fc39bd350438","src\/Filter\/FieldDefinitionAdapter\/ManyToOneRelation.php":"be101a1c2039544dd74463549f45bf95","src\/Filter\/FieldDefinitionAdapter\/Numeric.php":"2cc2cd7cd9c1ddec8a4bb4a21ea53399","src\/Controller\/AdminController.php":"c4708487335e33f6dfde4c1b110780f0","src\/Command\/ProcessUpdateQueueCommand.php":"f9a041480b708954287d7d18dc8a3276","src\/Command\/ReindexCommand.php":"74db28a670568d483fb5b06fce01a4a7","src\/Command\/ServiceAwareCommand.php":"d9ca8275124bfd6753bfe25ddf333d5f","src\/Command\/UpdateMappingCommand.php":"2a78669030ca035aa2b0e0a8beabab88","src\/Event\/FilterListingEvent.php":"68de5cfcb6c331192c12f55ec04b2bb4","src\/Event\/FilterSearchEvent.php":"b2c947645d2f7c9a89264f9d134fbd8e","src\/Event\/AbstractFilterListener.php":"968027bb3d9a5da60bdd857600c2573c","src\/Event\/AdvancedObjectSearchEvents.php":"adf9e7d57e4c000ce84a14c423a735b3","src\/Event\/SavedSearchEvents.php":"b1398692f70f07c5ea8d79c2962b0b2c","src\/Event\/SavedSearchEvent.php":"92b636a6ea53e4b45ce9655a78f8e025","src\/EventListener\/IndexUpdateListener.php":"a980da613c7007060b0113a3c376b826","src\/Factory\/OpenSearch\/LegacyServiceFactory.php":"07e20c0270cdfc33fda88788ab7a9453","src\/Tools\/IndexConfigService.php":"4d2b0d2d59b9881998418c1a137d1cfe","src\/Enum\/ClientType.php":"4caf1e98b2472d228d54ff424ebeafc7","src\/Model\/SavedSearch.php":"cc3937d2032b46e074b6ef38cc1506bc","src\/Model\/SavedSearch\/Listing.php":"8f7001569e9108751323d43557d5d3c4","src\/Model\/SavedSearch\/Dao.php":"bdeab30bd1d0e2e013a6ac3e35b8eb81","src\/Model\/SavedSearch\/Listing\/Dao.php":"df3dbd55b7a4e048ea1dd3a2f064cb89","src\/DependencyInjection\/OpenDxpAdvancedObjectSearchExtension.php":"8da79f10af3bc2834450cfd3b86b2f0f","src\/DependencyInjection\/Configuration.php":"b4828f2a77345ad662fd852f73fc9163","src\/Maintenance\/UpdateQueueProcessor.php":"d88d9dd4de6a7a77d7f302eb5775d542","src\/Installer.php":"db2ff2f020b0026f458812af783139e8","src\/OpenDxpAdvancedObjectSearchBundle.php":"3fc378643ac9911bea61f9941c429c3f","src\/Service.php":"549082bc5457e60e79e0f08029652bf1","src\/Messenger\/QueueHandler.php":"bf049cec4ff8af60c75a7d467b3315e0","src\/Messenger\/QueueMessage.php":"ddfad4d17f21dccc62ecd8538e151bee"}}

src/Command/ProcessUpdateQueueCommand.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Command;

src/Command/ReindexCommand.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Command;

src/Command/ServiceAwareCommand.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Command;

src/Command/UpdateMappingCommand.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Command;

src/Controller/AdminController.php

@@ -1,25 +1,25 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Controller;
 
+use OpenDxp\Bundle\AdminBundle\Helper\QueryParams;
 use OpenDxp\Bundle\AdvancedObjectSearchBundle\Event\AdvancedObjectSearchEvents;
 use OpenDxp\Bundle\AdvancedObjectSearchBundle\Event\FilterListingEvent;
 use OpenDxp\Bundle\AdvancedObjectSearchBundle\Model\SavedSearch;
 use OpenDxp\Bundle\AdvancedObjectSearchBundle\Service;
-use OpenDxp\Bundle\AdminBundle\Helper\QueryParams;
 use OpenDxp\Controller\Traits\JsonHelperTrait;
 use OpenDxp\Controller\UserAwareController;
 use OpenDxp\Db;
@@ -50,11 +50,13 @@ public function getFieldsAction(Request $request, Service $service): JsonRespons
                 $classId = strip_tags($request->query->getString('class_id'));
                 $definition = DataObject\ClassDefinition::getById($classId);
                 $allowInheritance = $definition->getAllowInherit();
+
                 break;
 
             case 'fieldcollection':
                 $key = strip_tags($request->query->getString('key'));
                 $definition = DataObject\Fieldcollection\Definition::getByKey($key);
+
                 break;
 
             case 'objectbrick':
@@ -331,7 +333,7 @@ public function findAction(Request $request): JsonResponse
                 'description' => $result->getDescription(),
                 'category' => $result->getCategory(),
                 'owner' => $result->getOwner() ? $result->getOwner()->getUsername() . ' (' . $result->getOwner()->getFirstname() . ' ' . $result->getOwner()->getLastName() . ')' : '',
-                'ownerId' => $result->getOwnerId()
+                'ownerId' => $result->getOwnerId(),
             ];
         }
 
@@ -395,10 +397,10 @@ public function loadSearchAction(Request $request): JsonResponse
                     'sharedUserIds' => $savedSearch->getSharedUserIds(),
                     'shareGlobally' => $savedSearch->getShareGlobally(),
                     'isOwner' => $savedSearch->getOwnerId() == $this->getOpenDxpUser()->getId(),
-                    'hasShortCut' => $savedSearch->isInShortCutsForUser($this->getOpenDxpUser())
+                    'hasShortCut' => $savedSearch->isInShortCutsForUser($this->getOpenDxpUser()),
                 ],
                 'conditions' => $config['conditions'],
-                'gridConfig' => $config['gridConfig']
+                'gridConfig' => $config['gridConfig'],
             ]);
         }
 
@@ -415,7 +417,7 @@ public function loadShortCutsAction(Request $request): JsonResponse
                 true,
                 $this->getOpenDxpUser()->getId(),
                 '%,' . $this->getOpenDxpUser()->getId() . ',%',
-                '%,' . $this->getOpenDxpUser()->getId() . ',%'
+                '%,' . $this->getOpenDxpUser()->getId() . ',%',
             ]
         );
         $list->load();
@@ -424,7 +426,7 @@ public function loadShortCutsAction(Request $request): JsonResponse
         foreach ($list->getSavedSearches() as $entry) {
             $entries[] = [
                 'id' => $entry->getId(),
-                'name' => $entry->getName()
+                'name' => $entry->getName(),
             ];
         }
 
@@ -479,7 +481,7 @@ public function getUsersAction(Request $request): JsonResponse
         foreach ($userList as $user) {
             $users[] = [
                 'id' => $user->getId(),
-                'label' => $user->getName()
+                'label' => $user->getName(),
             ];
         }
 
@@ -499,7 +501,7 @@ public function getRolesAction(): JsonResponse
         foreach ($rolesList->getRoles() as $role) {
             $roles[] = [
                 'id' => $role->getId(),
-                'label' => $role->getName()
+                'label' => $role->getName(),
             ];
         }
 

src/DependencyInjection/Configuration.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\DependencyInjection;
@@ -26,15 +26,12 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('opendxp_advanced_object_search');
         $rootNode = $treeBuilder->getRootNode();
 
-        /* @phpstan-ignore-next-line */
+        // @phpstan-ignore-next-line
         $rootNode
             ->children()
                 ->scalarNode('index_name_prefix')

src/DependencyInjection/OpenDxpAdvancedObjectSearchExtension.php

@@ -1,16 +1,16 @@
 <?php
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\DependencyInjection;
@@ -86,9 +86,6 @@ public function loadInternal(array $config, ContainerBuilder $container): void
         $container->setAlias('opendxp.advanced_object_search.search-client', $clientId);
     }
 
-    /**
-     * @param ContainerBuilder $container
-     */
     public function prepend(ContainerBuilder $container)
     {
         if ($container->hasExtension('doctrine_migrations')) {

src/Enum/ClientType.php

@@ -2,16 +2,16 @@
 declare(strict_types=1);
 
 /**
- * Pimcore
+ * OpenDXP
+ *
+ * This source file is licensed under the GNU General Public License version 3 (GPLv3).
  *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ * @copyright  Copyright (c) Pimcore GmbH (https://pimcore.com)
+ * @copyright  Modification Copyright (c) OpenDXP (https://www.opendxp.ch)
+ * @license    https://www.gnu.org/licenses/gpl-3.0.html  GNU General Public License version 3 (GPLv3)
  */
 
 namespace OpenDxp\Bundle\AdvancedObjectSearchBundle\Enum;