From d147fa1d8f53fdf832c72129d5a1dc8211f33c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Tue, 31 Aug 2021 16:23:53 +0200 Subject: [PATCH 1/2] Use proper operator --- .../ext/ep_products/Classes/Service/ContingentImportService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php index 36317548..7b2c2dbd 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php @@ -268,7 +268,7 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac if (in_array($roomCode, $this->ignoredRoomTypes, true)) { continue; } - $roomTypeBusProId = $roomType['link'] ?? $roomType['idBusPro']; + $roomTypeBusProId = $roomType['link'] ?: $roomType['idBusPro']; $xpath = sprintf('zimmerliste/zimmer[@idbuspro="%d"]', $roomTypeBusProId); $xmlRoom = $xmlDate->xpath($xpath)[0]; $this->calculateContingent($xmlRoom, $roomType, $date, $hotelData); From 21563bf76f966a4c7b814f75692e2574fa302e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 8 Sep 2021 07:56:02 +0200 Subject: [PATCH 2/2] Adopt php version of prod env in GitHub action --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index c908c50d..8d85ee8e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.3 + php-version: 7.4 - name: Install dependencies run: composer install --prefer-dist --no-progress