Skip to content

Commit 9cdf3dd

Browse files
Solr 9.6 → 9.7 for integration tests (solariumphp#1133)
* Solr 9.6 → 9.7 for integration tests * Adjust managed resource test for Solr 8.11.4
1 parent daf9df3 commit 9cdf3dd

File tree

5 files changed

+309
-317
lines changed

5 files changed

+309
-317
lines changed

.github/workflows/run-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
ref: branch_8_11
5252
path: lucene-solr
5353

54-
- name: Checkout solr 9.6
54+
- name: Checkout solr 9.7
5555
if: matrix.solr == 9
5656
uses: actions/checkout@v4
5757
with:
5858
repository: apache/solr
59-
ref: branch_9_6
59+
ref: branch_9_7
6060
path: lucene-solr
6161

6262
- name: Start Solr ${{ matrix.solr }} in ${{ matrix.mode }} mode

src/Support/Utility.php

+18
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,22 @@ public static function compactSolrClassName(string $className): string
132132
{
133133
return preg_replace('/(?<=[a-z1-9])[a-z1-9]+(?=\.)/i', '', $className);
134134
}
135+
136+
/**
137+
* Recursively sorts an array in place by keys in ascending order.
138+
*
139+
* @param array $array
140+
*
141+
* @return bool Always returns true
142+
*/
143+
public static function recursiveKeySort(array &$array): bool
144+
{
145+
foreach ($array as &$value) {
146+
if (\is_array($value)) {
147+
self::recursiveKeySort($value);
148+
}
149+
}
150+
151+
return ksort($array);
152+
}
135153
}

0 commit comments

Comments
 (0)