[Core] Fix wrong exported StringQuery with order

lib/Core/Exporter/StringExporter.php

@@ -39,7 +39,16 @@ public function exportCondition(SearchCondition $condition): string
     {
         $this->fields = $this->resolveLabels($fieldSet = $condition->getFieldSet());
 
-        return $this->exportOrder($condition, $fieldSet) . $this->exportGroup($condition->getValuesGroup(), $fieldSet, true);
+        $valuesGroup = $condition->getValuesGroup();
+        $result = '';
+
+        if ($valuesGroup->countValues() > 0 && $valuesGroup->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_OR) {
+            $result .= '* ';
+        }
+
+        $result .= $this->exportOrder($condition, $fieldSet);
+
+        return trim($result . $this->exportGroup($valuesGroup, $fieldSet, true));
     }
 
     abstract protected function resolveLabels(FieldSet $fieldSet): array;
@@ -59,18 +68,14 @@ protected function exportOrder(SearchCondition $condition, FieldSet $fieldSet):
             $result .= ': ' . $this->modelToExported($direction, $fieldSet->get($name)) . '; ';
         }
 
-        return trim($result);
+        return ltrim($result);
     }
 
     protected function exportGroup(ValuesGroup $valuesGroup, FieldSet $fieldSet, bool $isRoot = false): string
     {
         $result = '';
         $exportedGroups = '';
 
-        if ($isRoot && $valuesGroup->countValues() > 0 && $valuesGroup->getGroupLogical() === ValuesGroup::GROUP_LOGICAL_OR) {
-            $result .= '*';
-        }
-
         foreach ($valuesGroup->getFields() as $name => $values) {
             if ($fieldSet->isPrivate($name) || $values->count() === 0) {
                 continue;

lib/Core/Exporter/StringQueryExporter.php

@@ -15,7 +15,6 @@
 
 use Rollerworks\Component\Search\Field\FieldConfig;
 use Rollerworks\Component\Search\FieldSet;
-use Rollerworks\Component\Search\SearchCondition;
 
 /**
  * Exports the SearchCondition as StringQuery string.

lib/Core/Test/SearchConditionExporterTestCase.php

@@ -35,6 +35,8 @@
 
 /**
  * @author Sebastiaan Stok <[email protected]>
+ *
+ * @internal This class is not covered by the BC promise.
  */
 abstract class SearchConditionExporterTestCase extends SearchIntegrationTestCase
 {

lib/Core/Tests/Exporter/StringQueryExporterTest.php

@@ -124,6 +124,33 @@ public function it_exports_with_ordering_aliases(): void
         $this->assertConditionEquals('@id: desc; @status: asc;', $condition, $processor, $config);
     }
 
+    /** @test */
+    public function it_exports_with_ordering_and_root_group_logical(): void
+    {
+        $exporter = $this->getExporter();
+        $fieldSet = $this->getFieldSet(false)
+            ->add('@id', OrderFieldType::class)
+            ->add('@status', OrderFieldType::class)
+            ->getFieldSet()
+        ;
+
+        $config = new ProcessorConfig($fieldSet);
+
+        $condition = new SearchCondition(
+            $config->getFieldSet(),
+            (new ValuesGroup(ValuesGroup::GROUP_LOGICAL_OR))->addField('name', (new ValuesBag())->addSimpleValue('value '))
+        );
+
+        $orderGroup = (new ValuesGroup())
+            ->addField('@id', (new ValuesBag())->addSimpleValue('DESC'))
+            ->addField('@status', (new ValuesBag())->addSimpleValue('ASC'))
+        ;
+        $condition->setOrder(new SearchOrder($orderGroup));
+
+        $this->assertExportEquals('* @id: desc; @status: asc; name: "value ";', $exporter->exportCondition($condition));
+        $this->assertConditionEquals('* @id: desc; @status: asc; name: "value ";', $condition, $this->getInputProcessor(), $config);
+    }
+
     public function provideSingleValuePairTest()
     {
         return 'name: "value ", -value2, value2-, 10.00, "10,00", hÌ, ٤٤٤٦٥٤٦٠٠, "doctor""who""""", !value3; price: € 12.00, "12,00 $", $ 12.00;';