Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable27] Bump version + fix 32 bit tests #39775

Closed
wants to merge 103 commits into from

Conversation

marcelklehr
Copy link
Member

Checklist

Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 70d5bf7)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 01dd1a8)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 6fc4cb6)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 82d3b00)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 9e9fc1d)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 9d5717d)
Signed-off-by: Marcel Klehr <[email protected]>

(cherry picked from commit 795b097)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit b6941aa)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit b8a9f08)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit b6a95e3)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 9935034)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit fac83ce)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 75d7af8)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 72ea761)
Co-authored-by: Julien Veyssier <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 249dd5c)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit fb4de16)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 5bc6180)
Co-authored-by: Daniel <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit fb55afc)
Co-authored-by: Daniel <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 8e4aa92)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 906e9b7)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 83db23e)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit a7cd6bf)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit b00a9a6)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 94fcf88)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 1d3661d)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit cb0f918)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 1623ad9)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 0a94525)
…zed types

Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 27e1c86)
marcelklehr and others added 25 commits August 9, 2023 10:22
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 8ec1926)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit a840e8c)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 2a3ef10)
…r precedence

Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 2d29413)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit aa74d6f)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit f72f3f7)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 4ec150c)
Signed-off-by: Marcel Klehr <[email protected]>

(cherry picked from commit 112268a)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit a193458)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit be7487b)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit ad3f353)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit a0eaed0)
Co-authored-by: Julien Veyssier <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 3ca4428)
Co-authored-by: Julien Veyssier <[email protected]>
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit ff39466)
Signed-off-by: Marcel Klehr <[email protected]>
(cherry picked from commit 830692c)
Signed-off-by: Julien Veyssier <[email protected]>
(cherry picked from commit 5776406)
Signed-off-by: Julien Veyssier <[email protected]>
(cherry picked from commit 601679b)
Signed-off-by: Julien Veyssier <[email protected]>
(cherry picked from commit 0ace67c)
Signed-off-by: Julien Veyssier <[email protected]>
(cherry picked from commit a877865)
Signed-off-by: Julien Veyssier <[email protected]>
(cherry picked from commit 8d6a6e5)
switch($key) {
case 'ai.textprocessing_provider_preferences':
// fill $value with $defaultValue values
$value = array_merge($defaultValue, $value);

Check notice

Code scanning / Psalm

PossiblyInvalidArgument Note

Argument 1 of array_merge expects array<array-key, mixed>, but possibly different type array<class-string<OCP\TextProcessing\ITaskType>|int<0, max>, class-string<OCP\TextProcessing\IProvider<OCP\TextProcessing\ITaskType>>|class-string<OCP\Translation\ITranslationProvider>>|class-string<OCP\SpeechToText\ISpeechToTextProvider>|null provided
$value = array_merge($defaultValue, $value);
break;
case 'ai.translation_provider_preferences':
$value += array_diff($defaultValue, $value); // Add entries from $defaultValue that are not in $value to the end of $value

Check notice

Code scanning / Psalm

PossiblyInvalidArgument Note

Argument 1 of array_diff expects array<array-key, mixed>, but possibly different type array<class-string<OCP\TextProcessing\ITaskType>|int<0, max>, class-string<OCP\TextProcessing\IProvider<OCP\TextProcessing\ITaskType>>|class-string<OCP\Translation\ITranslationProvider>>|class-string<OCP\SpeechToText\ISpeechToTextProvider>|null provided
@marcelklehr marcelklehr closed this Aug 9, 2023
@skjnldsv skjnldsv deleted the backport/39660/stable27 branch March 14, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants