Merge pull request #11 from tine-groupware/pu/ps/ci

make github ci work again
tine-groupware · Jan 17, 2024 · 19bb4b2 · 19bb4b2
2 parents caac13c + 377f7ee
commit 19bb4b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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: |      

diff --git 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());
 

diff --git 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 => [