From 449e6d0ca2f541c4b477a3ca3df43fa073394165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= Date: Tue, 16 Jan 2024 17:11:10 +0100 Subject: [PATCH 1/3] conf(ci/github): update php versions (8.0 & 8.1) --- .github/workflows/php-unit-test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php-unit-test.yml b/.github/workflows/php-unit-test.yml index 0ad4e3250dd..bf7b4f3fed4 100644 --- a/.github/workflows/php-unit-test.yml +++ b/.github/workflows/php-unit-test.yml @@ -21,8 +21,8 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-20.04] - php-versions: ['7.4', '8.0'] + operating-system: [ubuntu-22.04] + php-versions: ['8.0', '8.1'] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: @@ -39,7 +39,6 @@ jobs: sudo systemctl start mysql.service mysql -uroot -proot --host 127.0.0.1 -e 'CREATE DATABASE IF NOT EXISTS tine20;' mysql -uroot -proot --host 127.0.0.1 -e "ALTER USER root@localhost IDENTIFIED WITH mysql_native_password BY 'root';" - - name: Install tine20 run: | From 7431c850781f3a7e76cbcc7b587b8e1cc21591a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= Date: Wed, 17 Jan 2024 09:33:16 +0100 Subject: [PATCH 2/3] tests(github): remove duplicate Addressbook_Frontend_JsonTest --- tests/tine20/GithubTests.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/tine20/GithubTests.php b/tests/tine20/GithubTests.php index 0aff74a3011..28add55a2de 100644 --- a/tests/tine20/GithubTests.php +++ b/tests/tine20/GithubTests.php @@ -23,7 +23,6 @@ public static function suite() Tinebase_Config::getInstance()->set(Tinebase_Config::USE_NOMINATIM_SERVICE, false); // addressbook - $suite->addTestSuite(Addressbook_Frontend_JsonTest::class); $suite->addTest(Addressbook_Frontend_AllTests::suite()); $suite->addTest(Addressbook_Convert_Contact_VCard_AllTests::suite()); From 377f7eef60729aff2ccee676e7b5f142a74d2084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= Date: Wed, 17 Jan 2024 09:33:42 +0100 Subject: [PATCH 3/3] tweak(Addressbook/Contact): check if GDPR is installed ... when expanding gdpr props --- tine20/Addressbook/Controller/Contact.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tine20/Addressbook/Controller/Contact.php b/tine20/Addressbook/Controller/Contact.php index 21097c6eedb..9d5a0cbaadb 100644 --- a/tine20/Addressbook/Controller/Contact.php +++ b/tine20/Addressbook/Controller/Contact.php @@ -1529,7 +1529,9 @@ public function getContactsRecipientToken(array $contacts): array $mailTypes = ['email', 'email_home']; $possibleAddresses = []; - if (class_exists('GDPR_Controller_DataIntendedPurposeRecord')) { + if (class_exists('GDPR_Controller_DataIntendedPurposeRecord') + && Tinebase_Application::getInstance()->isInstalled('GDPR') + ) { $expander = new Tinebase_Record_Expander(Addressbook_Model_Contact::class, [ Tinebase_Record_Expander::EXPANDER_PROPERTIES => [ GDPR_Controller_DataIntendedPurposeRecord::ADB_CONTACT_CUSTOM_FIELD_NAME => [