Skip to content

Commit aecda5e

Browse files
committed
Merge branch '2.0' into 3.0
* 2.0: TASK: Adjust versions of github actions TASK: Adjust target branch to run ci for from main to 2.0 Make nullability explicit # Conflicts: # .github/workflows/build.yml
2 parents b12bf36 + 254b97c commit aecda5e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ name: build
33
on:
44
push:
55
branches:
6-
- 'main'
7-
- 'neos9'
6+
- '3.0'
87
pull_request:
98
branches:
10-
- 'main'
11-
- 'neos9'
9+
- '3.0'
1210

1311
jobs:
1412
test:

Classes/Infrastructure/DeepL/DeepLTranslationService.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ protected function getDeeplAuthenticationKey(): DeepLAuthenticationKey
221221
*
222222
* @return string
223223
*/
224-
public static function getEntryIdentifier(string $text, string $targetLanguage, string $sourceLanguage = null): string
224+
public static function getEntryIdentifier(string $text, string $targetLanguage, ?string $sourceLanguage = null): string
225225
{
226226
return sha1($text . $targetLanguage . $sourceLanguage);
227227
}
@@ -249,7 +249,7 @@ protected function getBrowser(): Browser
249249
protected function createRequest(
250250
string $endpoint,
251251
string $method = 'GET',
252-
string $body = null
252+
?string $body = null
253253
): ServerRequestInterface {
254254
$deeplAuthenticationKey = $this->getDeeplAuthenticationKey();
255255
$baseUri = $deeplAuthenticationKey->isFree ? $this->settings['baseUriFree'] : $this->settings['baseUri'];

0 commit comments

Comments
 (0)